OSDN Git Service

android-x86/frameworks-base.git
8 years agoam 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next...
Adrian Roos [Thu, 24 Sep 2015 23:25:48 +0000 (23:25 +0000)]
am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev

* commit '9ceec2f0f007e05ed2842f222b4f652bdd69eb3f':
  DO NOT MERGE Send next alarm's show intent via PendingIntent

8 years agoam f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show...
Adrian Roos [Thu, 24 Sep 2015 23:11:55 +0000 (23:11 +0000)]
am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev

* commit 'f6c7515817f9a4c24d2ff9baba2f916795862098':
  DO NOT MERGE Send next alarm's show intent via PendingIntent

8 years agoam 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via...
Adrian Roos [Thu, 24 Sep 2015 22:59:37 +0000 (22:59 +0000)]
am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev

* commit '12c54dfa1219c5bb81482fe4bd4b164637f2e8b2':
  DO NOT MERGE Send next alarm's show intent via PendingIntent

8 years agoam c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent...
Adrian Roos [Thu, 24 Sep 2015 22:49:19 +0000 (22:49 +0000)]
am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev

* commit 'c9f7abe3705f7c74ad768e0a8e093f6f11e70e1c':
  DO NOT MERGE Send next alarm's show intent via PendingIntent

8 years agoMerge "DO NOT MERGE Send next alarm's show intent via PendingIntent" into lmp-dev
Adrian Roos [Thu, 24 Sep 2015 22:39:23 +0000 (22:39 +0000)]
Merge "DO NOT MERGE Send next alarm's show intent via PendingIntent" into lmp-dev

8 years agoam 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequest...
Paul Jensen [Wed, 23 Sep 2015 11:33:18 +0000 (11:33 +0000)]
am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit '4cbfe3316fd1105b697a9838ef7bafaebf5080a2':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network...
Paul Jensen [Wed, 23 Sep 2015 11:33:13 +0000 (11:33 +0000)]
am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '10a7d7449dae2aabf4f22f980e7efabf274a939a':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoam 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted...
Paul Jensen [Wed, 23 Sep 2015 11:21:27 +0000 (11:21 +0000)]
am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit '773d71e7c45d12810267bb24735360da6e5b258d':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability...
Paul Jensen [Wed, 23 Sep 2015 11:21:22 +0000 (11:21 +0000)]
am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '96cd7c14b5e4a82727f7b56bbdf6cfafda0f17b6':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoam 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they...
Paul Jensen [Wed, 23 Sep 2015 11:13:48 +0000 (11:13 +0000)]
am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit '962c3a0f2dd46d55ea591671c0a90c1c40214af7':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce...
Paul Jensen [Wed, 23 Sep 2015 11:13:40 +0000 (11:13 +0000)]
am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '635f871132449bea7489f6a61276979beeee5591':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoam ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have...
Paul Jensen [Wed, 23 Sep 2015 11:06:32 +0000 (11:06 +0000)]
am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit 'ece4ac2105d18d8d7b6296d6de3fdd5641c35258':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
Paul Jensen [Wed, 23 Sep 2015 11:06:27 +0000 (11:06 +0000)]
am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit 'a9e98343146244b71e236d82c95a8d0fa30a41c1':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoMerge "Don't mark NetworkRequests restricted when they don't have restricted caps...
Paul Jensen [Wed, 23 Sep 2015 10:59:31 +0000 (10:59 +0000)]
Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into lmp-dev

8 years agoMerge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
Paul Jensen [Wed, 23 Sep 2015 10:58:57 +0000 (10:58 +0000)]
Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

8 years agoam ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09...
Zach Jang [Mon, 21 Sep 2015 21:07:04 +0000 (21:07 +0000)]
am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'ba80596bc0d51b3ddf14c1612c341992bc3ac5fc':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag...
Zach Jang [Mon, 21 Sep 2015 21:06:58 +0000 (21:06 +0000)]
am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'b5173241d160a5b6f4d440a01c9a9b0281ee4e66':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f35...
Zach Jang [Mon, 21 Sep 2015 19:10:51 +0000 (19:10 +0000)]
am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'f8cda08986a5caa14daace69e24c82224ac5a9fc':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp...
Zach Jang [Mon, 21 Sep 2015 19:10:46 +0000 (19:10 +0000)]
am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'e54c195a53694696e0913722fa721c882e33753e':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT...
Zach Jang [Mon, 21 Sep 2015 18:58:27 +0000 (18:58 +0000)]
am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'b2b3cecbd3de80d40f8c207c6aa94532c3426829':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security...
Zach Jang [Mon, 21 Sep 2015 18:58:18 +0000 (18:58 +0000)]
am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit '0a8197b1e43bc3771fc3f8595619603ec8f6f641':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev
Zach Riggle [Thu, 17 Sep 2015 22:17:11 +0000 (22:17 +0000)]
am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev

* commit 'f68b1953259a13562f5a2331526edafae5c1d99f':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

8 years agoam 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev
Zach Riggle [Thu, 17 Sep 2015 22:00:29 +0000 (22:00 +0000)]
am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev

* commit '683cd049f7c762251567a0e0386ee49bb1428351':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

8 years agoresolved conflicts for 521def98 to lmp-mr1-dev
Zach Riggle [Thu, 17 Sep 2015 21:34:08 +0000 (17:34 -0400)]
resolved conflicts for 521def98 to lmp-mr1-dev

8 years agoam 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport...
Zach Jang [Thu, 17 Sep 2015 20:44:41 +0000 (20:44 +0000)]
am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit '7b5bf993e4cc9f333a9adb3a00672c668a0f3fdb':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165...
Zach Jang [Thu, 17 Sep 2015 20:32:53 +0000 (20:32 +0000)]
am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'fe4cbf2b1b135b327018915a512a8e6293a96017':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security...
Zach Jang [Thu, 17 Sep 2015 20:24:00 +0000 (20:24 +0000)]
am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'cff4e09e26e3b976aa0273df78e89f592fc6d287':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level...
Zach Jang [Thu, 17 Sep 2015 20:09:55 +0000 (20:09 +0000)]
am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'bdf7f3583c637f370e97e74526df14b9c70e6493':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level...
Zach Jang [Thu, 17 Sep 2015 20:04:23 +0000 (20:04 +0000)]
am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit '1cf21e443aaf207b962f50169be28c0babe71f61':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoDO NOT MERGE - Backport of ag/748165 to klp-dev
Zach Jang [Fri, 11 Sep 2015 23:35:04 +0000 (16:35 -0700)]
DO NOT MERGE - Backport of ag/748165 to klp-dev
Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d

8 years agoDO NOT MERGE - Backport of ag/748165 to klp-dev
Zach Jang [Fri, 11 Sep 2015 23:35:04 +0000 (16:35 -0700)]
DO NOT MERGE - Backport of ag/748165 to klp-dev
Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d

8 years agoam 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout...
Zach Jang [Wed, 16 Sep 2015 01:56:57 +0000 (01:56 +0000)]
am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev

* commit '11317e82cf561597bbd4e2dbf5840854e6b7a16d':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""

8 years agoam 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncry...
Zach Jang [Wed, 16 Sep 2015 01:56:52 +0000 (01:56 +0000)]
am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev

* commit '00db0826561b23a54db28ed5203fd7eff79c16c7':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."

8 years agoam 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt...
Zach Jang [Wed, 16 Sep 2015 01:44:58 +0000 (01:44 +0000)]
am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev

* commit '32a420ea36fbae07484f6fcf718ed97865ca3158':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""

8 years agoam 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s...
Zach Jang [Wed, 16 Sep 2015 01:44:53 +0000 (01:44 +0000)]
am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev

* commit '203b43547da94c9fb78931680b99f9db49fc46c9':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."

8 years agoMerge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""...
Zach Jang [Wed, 16 Sep 2015 01:40:18 +0000 (01:40 +0000)]
Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev

8 years agoRevert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 01:38:41 +0000 (01:38 +0000)]
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""

This reverts commit 3b49affdb3e18bbe48fc7ab00ccbe2c073b7e35e.

Change-Id: I8639fc6865081f6b1a5773b884f8298cce0d3e7d

8 years agoMerge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp...
Zach Jang [Wed, 16 Sep 2015 01:37:36 +0000 (01:37 +0000)]
Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev

8 years agoDO NOT MERGE Send next alarm's show intent via PendingIntent
Adrian Roos [Sat, 12 Sep 2015 00:46:23 +0000 (17:46 -0700)]
DO NOT MERGE Send next alarm's show intent via PendingIntent

Bug: 23909438
Change-Id: I0bb277c8385b7936fbda03cd76f02248c4fc55de

8 years agoRevert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Tue, 15 Sep 2015 20:09:52 +0000 (20:09 +0000)]
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."

This reverts commit 82b70db7dd906013d131737a5bec2ae59b41ae61.

Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f

8 years agoam 4c330c6a: DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Michael Wright [Sat, 12 Sep 2015 06:29:09 +0000 (06:29 +0000)]
am 4c330c6a: DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

* commit '4c330c6ae53df48f6486b6f047021b204fc66594':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

8 years agoMerge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct...
Android Git Automerger [Tue, 8 Sep 2015 21:37:33 +0000 (21:37 +0000)]
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev

8 years agodocs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 11 Aug 2015 18:43:59 +0000 (11:43 -0700)]
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

b/22822607

Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20

8 years agoam 4b32b3f4: Merge "docs: change intro and title for contacts and sign-in lesson...
Cheryl Potter [Tue, 8 Sep 2015 21:36:35 +0000 (21:36 +0000)]
am 4b32b3f4: Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs

* commit '4b32b3f43fe8e27ffdb19d51364ebd99a3503e79':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

8 years agoMerge "docs: change intro and title for contacts and sign-in lesson, and remove empty...
Cheryl Potter [Tue, 8 Sep 2015 21:28:06 +0000 (21:28 +0000)]
Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs

8 years agodocs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 11 Aug 2015 18:43:59 +0000 (11:43 -0700)]
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

b/22822607

Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20

8 years agoam 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in...
Cheryl Potter [Fri, 4 Sep 2015 22:24:55 +0000 (22:24 +0000)]
am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs

* commit '79ad6310ea3ca5931013cf746babf55cf391cc8f':
  docs: changed references to Google+ sign-in to Google sign-in

8 years agoam 81e0dff0: Minor fix on Auto Desktop Head Unit doc.
Renato Mangini [Fri, 4 Sep 2015 22:24:48 +0000 (22:24 +0000)]
am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.

* commit '81e0dff0da637f3580ac81e86950b23e9a55bbdc':
  Minor fix on Auto Desktop Head Unit doc.

8 years agoMerge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-previe...
Cheryl Potter [Fri, 4 Sep 2015 22:14:25 +0000 (22:14 +0000)]
Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs

8 years agoam dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching.
Deepanshu Gupta [Tue, 1 Sep 2015 23:59:10 +0000 (23:59 +0000)]
am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching.

* commit 'dd21212fa1a9c907d5d2f80f3de2413f6c14da7a':
  LayoutLib: Fix typedArray caching.

8 years agoam eb26f5ce: LayoutLib: Fix typedArray caching.
Deepanshu Gupta [Tue, 1 Sep 2015 23:40:40 +0000 (23:40 +0000)]
am eb26f5ce: LayoutLib: Fix typedArray caching.

* commit 'eb26f5cecd5366b29b3cb746a7edaf3769f40480':
  LayoutLib: Fix typedArray caching.

8 years agoLayoutLib: Fix typedArray caching.
Deepanshu Gupta [Wed, 26 Aug 2015 18:54:50 +0000 (11:54 -0700)]
LayoutLib: Fix typedArray caching.

The typedArray depends on the current context (more specifically, the
themes set on the context). The fact was ignored in the caching of the
typedArray and caused the android:theme attribute to be ignored in
certain cases.

Change-Id: If095580919474f12c0eb4e1f8fb7f076cf3c4ed0

8 years agoam 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if...
Bart Sears [Mon, 31 Aug 2015 22:20:06 +0000 (22:20 +0000)]
am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev

* commit '3cb7e91f2cd1fb29e6d0926e35f90647200c1af4':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

8 years agoam 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Tao Bao [Mon, 31 Aug 2015 22:19:58 +0000 (22:19 +0000)]
am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.

* commit '35c1eb9e6506b407a1af40359d48bb06d884385d':
  [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.

8 years agoam 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for...
Bart Sears [Mon, 31 Aug 2015 22:03:48 +0000 (22:03 +0000)]
am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev

* commit '199c74eab1a30bff7db7bb4d24c161f36edb7f5b':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

8 years agoam 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Tao Bao [Mon, 31 Aug 2015 22:03:44 +0000 (22:03 +0000)]
am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.

* commit '82b70db7dd906013d131737a5bec2ae59b41ae61':
  [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.

8 years agoMerge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into...
Bart Sears [Mon, 31 Aug 2015 21:53:46 +0000 (21:53 +0000)]
Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev

8 years ago[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Tao Bao [Sat, 29 Aug 2015 00:46:20 +0000 (17:46 -0700)]
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.

Bug: 23629892
Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d

8 years agoDO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Michael Wright [Mon, 24 Aug 2015 23:00:05 +0000 (00:00 +0100)]
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

If the given app name is too long for the permissions dialog, then
it can push the warning that the application will be able to record
the screen below the fold, letting the app basically set its own
dialog message in a way that a user would be difficult to detect as
fraudulant.

Bug: 23345192
Change-Id: If5881ca75d5c155ef5174351d245dbc3abdaa584

8 years agoDO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Michael Wright [Mon, 24 Aug 2015 23:00:05 +0000 (00:00 +0100)]
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

If the given app name is too long for the permissions dialog, then
it can push the warning that the application will be able to record
the screen below the fold, letting the app basically set its own
dialog message in a way that a user would be difficult to detect as
fraudulant.

Bug: 23345192
Change-Id: If5881ca75d5c155ef5174351d245dbc3abdaa584

8 years agoDon't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Fri, 28 Aug 2015 16:00:15 +0000 (12:00 -0400)]
Don't mark NetworkRequests restricted when they don't have restricted caps

Requests without NET_CAPABILITIES_INTERNET and just the default network
capabilities should not be marked restricted.  Without this fix apps
can hit permissions exceptions if they inadvertently make requests
without NET_CAPABILITIES_INTERNET.

Bug:23164917
Change-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6
(cherry picked from commit aae613d96134245af7c55976731a49fa59e77470)

8 years agoFix NOT_RESTRICTED network capability and enforce it.
Paul Jensen [Fri, 28 Aug 2015 15:58:50 +0000 (11:58 -0400)]
Fix NOT_RESTRICTED network capability and enforce it.

With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
   special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
   permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
   CONNECTIVITY_INTERNAL permission

Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
(cherry picked from commit 487ffe7d3d84bf65212158f7098e8a84b5b55e09)

8 years agoMinor fix on Auto Desktop Head Unit doc.
Renato Mangini [Thu, 27 Aug 2015 18:11:55 +0000 (11:11 -0700)]
Minor fix on Auto Desktop Head Unit doc.

Change-Id: I245484e87fadcc98fabc6f4c4fc67f2b454f9874

8 years agoam 0238bf24: docs: New auto Desktop Head Unit (DHU) docs
Rich Slogar [Thu, 27 Aug 2015 01:19:52 +0000 (01:19 +0000)]
am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs

* commit '0238bf248095682b870732432095a987ee558aa2':
  docs: New auto Desktop Head Unit (DHU) docs

8 years agodocs: New auto Desktop Head Unit (DHU) docs
Rich Slogar [Thu, 23 Jul 2015 23:05:27 +0000 (16:05 -0700)]
docs: New auto Desktop Head Unit (DHU) docs

See comment on patch set 9 for doc stage location.

bug:22069078
bug:23341937

Change-Id: I21565b82199394622ce4113b42174277c0248998

8 years agoam 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:22:48 +0000 (20:22 +0000)]
am 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]

* commit '4299409775ffd5cb70a8970c15807f33fc8b08d4':
  LayoutLib: Update golden test images. [DO NOT MERGE]

8 years agoam 2b99b5da: am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:22:43 +0000 (20:22 +0000)]
am 2b99b5da: am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE]

* commit '2b99b5da279a7cbf1f6412a8ac7d6bfdd82e26c6':
  An ugly hack to render CalendarView. [DO NOT MERGE]

8 years agoam 7eb81868: am b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT...
Deepanshu Gupta [Wed, 26 Aug 2015 20:22:35 +0000 (20:22 +0000)]
am 7eb81868: am b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

* commit '7eb81868c338fc78139592ac81845c080f53b1c5':
  LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

8 years agoam 9d6e87b6: am da687918: Make getInt in BridgeTypedArray accept empty String. [DO...
Deepanshu Gupta [Wed, 26 Aug 2015 20:22:29 +0000 (20:22 +0000)]
am 9d6e87b6: am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

* commit '9d6e87b67eb0d39d7584b12a3e843db68c8c9f3b':
  Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

8 years agoam c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:22:23 +0000 (20:22 +0000)]
am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE]

* commit 'c43506fc2dbe3fea6885e74ac8c67b91a0a644ff':
  Fix layout mirroring. [DO NOT MERGE]

8 years agoam 918e62f1: am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT...
Deepanshu Gupta [Wed, 26 Aug 2015 20:22:17 +0000 (20:22 +0000)]
am 918e62f1: am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

* commit '918e62f1cb7e5802cfb7435dd606380fa5d3a278':
  Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

8 years agoam eb15670c: am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:22:11 +0000 (20:22 +0000)]
am eb15670c: am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

* commit 'eb15670ccc46c688537cd99fa1af2e475a5fd2be':
  Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

8 years agoam 42e53ecb: am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:22:05 +0000 (20:22 +0000)]
am 42e53ecb: am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

* commit '42e53ecbc146c4b131961e1f1764fcf886204b07':
  Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

8 years agoam 5078ad32: am 6b1b651f: Fix imports. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:21:55 +0000 (20:21 +0000)]
am 5078ad32: am 6b1b651f: Fix imports. [DO NOT MERGE]

* commit '5078ad325b0da36fe798df1df428d12732548217':
  Fix imports. [DO NOT MERGE]

8 years agoam 4a213763: am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:21:49 +0000 (20:21 +0000)]
am 4a213763: am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE]

* commit '4a2137639aba761dcf289f1e2cc2e48dd42e7a3f':
  Fix theme namespace in tests. [DO NOT MERGE]

8 years agoam f988761c: am 723e136f: Run setup for full tests only once. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:21:43 +0000 (20:21 +0000)]
am f988761c: am 723e136f: Run setup for full tests only once. [DO NOT MERGE]

* commit 'f988761c0acc02bb4b21b6357e418da7799f11e7':
  Run setup for full tests only once. [DO NOT MERGE]

8 years agoam e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:21:38 +0000 (20:21 +0000)]
am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

* commit 'e54dbc4ac74d110c4121932a22d04447a0e15b65':
  LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

8 years agoam 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:21:29 +0000 (20:21 +0000)]
am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

* commit '147c0506d5425633f0d45e1489262d4e27a35921':
  LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

8 years agoam e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. ...
Deepanshu Gupta [Wed, 26 Aug 2015 20:21:23 +0000 (20:21 +0000)]
am e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

* commit 'e093bbf3997de7d2dddc2122c1349f734478f09f':
  Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

8 years agoam 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:21:16 +0000 (20:21 +0000)]
am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]

* commit '8a50ecea2ea0218377f7af8b4334b4ee4d386ef7':
  LayoutLib: translucent sys ui bars [DO NOT MERGE]

8 years agoam d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:21:09 +0000 (20:21 +0000)]
am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]

* commit 'd4be80d9962cdf5d68dccd3291ed1cabb76b6df2':
  Update nav bar icons. [DO NOT MERGE]

8 years agoam d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT...
Deepanshu Gupta [Wed, 26 Aug 2015 20:20:58 +0000 (20:20 +0000)]
am d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

* commit 'd1dde055060d63f8981ba51aeb75ab8a459db9b4':
  Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

8 years agoam 87f5fd6b: am c989950d: CalendarView rendering: use R.styleable to find attr. ...
Deepanshu Gupta [Wed, 26 Aug 2015 20:20:53 +0000 (20:20 +0000)]
am 87f5fd6b: am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

* commit '87f5fd6bf2c0d72fd37fb923b4d38225caa55d55':
  CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

8 years agoam e3eecca9: am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:20:45 +0000 (20:20 +0000)]
am e3eecca9: am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

* commit 'e3eecca924e7c7961c54eb37336767c995c936e7':
  Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

8 years agoam b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:20:35 +0000 (20:20 +0000)]
am b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]

* commit 'b406070040d1370b6ef6154cba3965c4ab016d66':
  Change tools:list_item to listitem. [DO NOT MERGE]

8 years agoam 8bfc5a9d: am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:20:30 +0000 (20:20 +0000)]
am 8bfc5a9d: am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE]

* commit '8bfc5a9d14000a436e54350099bd460f55418f27':
  Implement tools:list_item for RecyclerView. [DO NOT MERGE]

8 years agoam 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]
Jens Ole Lauridsen [Wed, 26 Aug 2015 20:20:24 +0000 (20:20 +0000)]
am 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]

* commit '67b73b60bf9c9f433ed282abdc3691ee0cc6dda0':
  Support AppBar from Material Design. [DO NOT MERGE]

8 years agoam 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:20:17 +0000 (20:20 +0000)]
am 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE]

* commit '6f5709ca97b27db9877c2fc65b083783d3f41e02':
  Update tests per new layoutlib_api [DO NOT MERGE]

8 years agoam 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:20:11 +0000 (20:20 +0000)]
am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]

* commit '9a13b1e7502734fbe54d6f0e1c386f5382dfa662':
  Add missing resolveResValue call. [DO NOT MERGE]

8 years agoam ad16968d: am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:20:05 +0000 (20:20 +0000)]
am ad16968d: am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]

* commit 'ad16968d506840a1c1824c4ab6b5c181c8e04086':
  LayoutLib: Skip classes from java package. [DO NOT MERGE]

8 years agoam 15e549a8: am 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:58 +0000 (20:19 +0000)]
am 15e549a8: am 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]

* commit '15e549a81f59daf016f29c6ed6f1aa3d5f65d41c':
  Skip warnings for some unresolved references. [DO NOT MERGE]

8 years agoam 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:52 +0000 (20:19 +0000)]
am 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE]

* commit '669e4969a7245cf9d1febc5d4e67a0f2063e87fb':
  Fix import order. [DO NOT MERGE]

8 years agoam c0fd1316: am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:39 +0000 (20:19 +0000)]
am c0fd1316: am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]

* commit 'c0fd131642f21eabec570147cf9f4116c900e8a0':
  Fix ParserFactory not initialized error. [DO NOT MERGE]

8 years agoam 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT...
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:32 +0000 (20:19 +0000)]
am 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

* commit '6b836cd06b1a2ebe5d31336486bb1b54e42439df':
  Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

8 years agoam 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:23 +0000 (20:19 +0000)]
am 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]

* commit '91e456d235256c385a7da1e45f098386bc68e86a':
  Fix BridgeTypedArray.getType() [DO NOT MERGE]

8 years agoam 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:13 +0000 (20:19 +0000)]
am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]

* commit '8a6295e82a2aed91eb26fa15479bf295c2bd79d7':
  Include Shapes in LayoutLib. [DO NOT MERGE]

8 years agoam 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:05 +0000 (20:19 +0000)]
am 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]

* commit '66d5f24df0c3627028812ee23da8d4f08cc83e5c':
  LayoutLib: Support getting resource arrays. [DO NOT MERGE]

8 years agoam b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:54 +0000 (20:18 +0000)]
am b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]

* commit 'b32e44ff0c5fd410720bb28c87bc9cea83556edf':
  LayoutLib: Change nullity annotations. [DO NOT MERGE]

8 years agoam 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO...
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:47 +0000 (20:18 +0000)]
am 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

* commit '1754824c2835d6f3a17c4a2c0ab668991797fcf9':
  Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

8 years agoam 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix)....
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:34 +0000 (20:18 +0000)]
am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

* commit '678f0ea2ba47f06387670e9f75b13637a6446899':
  Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]