Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,426 Commits 3 Branches 0 Tags
ba80596bc0d51b3ddf14c1612c341992bc3ac5fc
Commit Graph

164426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach Jang
ba80596bc0 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
 2015-09-21 19:10:51 +00:00
Zach Jang
b5173241d1 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
 2015-09-21 19:10:46 +00:00
Zach Jang
f8cda08986 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
 2015-09-21 18:58:27 +00:00
Zach Jang
e54c195a53 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
 2015-09-21 18:58:18 +00:00
Zach Riggle
f68b195325 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.
 2015-09-17 22:00:29 +00:00
Zach Riggle
683cd049f7 resolved conflicts for 521def98 to lmp-mr1-dev 2015-09-17 17:34:08 -04:00
Zach Jang
b2b3cecbd3 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
 2015-09-17 20:44:41 +00:00
Zach Jang
7b5bf993e4 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
 2015-09-17 20:32:53 +00:00
Zach Jang
fe4cbf2b1b 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
 2015-09-17 20:24:00 +00:00
Zach Jang
cff4e09e26 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
 2015-09-17 20:09:55 +00:00
Zach Jang
0a8197b1e4 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
 2015-09-17 20:04:23 +00:00
Zach Jang
1cf21e443a DO NOT MERGE - Backport of ag/748165 to klp-dev 
Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
 2015-09-17 01:20:27 +00:00
Zach Jang
bdf7f3583c DO NOT MERGE - Backport of ag/748165 to klp-dev 
Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
 2015-09-17 01:17:58 +00:00
Zach Jang
11317e82cf 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.""
 2015-09-16 01:44:58 +00:00
Zach Jang
00db082656 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."
 2015-09-16 01:44:53 +00:00
Zach Jang
32a420ea36 Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 2015-09-16 01:40:18 +00:00
Zach Jang
3ee9945be3 Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" 
This reverts commit 3b49affdb3.

Change-Id: I8639fc6865081f6b1a5773b884f8298cce0d3e7d
 2015-09-16 01:38:41 +00:00
Zach Jang
203b43547d Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 2015-09-16 01:37:36 +00:00
Zach Jang
3b49affdb3 Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s." 
This reverts commit 82b70db7dd.

Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f
 2015-09-15 20:09:52 +00:00
Michael Wright
521def98c0 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.
 2015-09-12 06:29:09 +00:00
Deepanshu Gupta
dd21212fa1 am eb26f5ce: LayoutLib: Fix typedArray caching. 
* commit 'eb26f5cecd5366b29b3cb746a7edaf3769f40480':
  LayoutLib: Fix typedArray caching.
 2015-09-01 23:40:40 +00:00
Deepanshu Gupta
eb26f5cecd 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
 2015-09-01 23:17:56 +00:00
Bart Sears
3cb7e91f2c 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.
 2015-08-31 22:03:48 +00:00
Tao Bao
35c1eb9e65 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.
 2015-08-31 22:03:44 +00:00
Bart Sears
199c74eab1 Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev 2015-08-31 21:53:46 +00:00
Tao Bao
82b70db7dd [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. 
Bug: 23629892
Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d
 2015-08-31 14:34:14 -07:00
Michael Wright
4c330c6ae5 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
 2015-08-28 19:47:23 +01:00
Michael Wright
78056370fa 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
 2015-08-28 19:05:58 +01:00
Deepanshu Gupta
4299409775 am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE] 
* commit 'a1be8b43e49d7b3555af6f284e4bb416ae6d477f':
  LayoutLib: Update golden test images. [DO NOT MERGE]
 2015-08-26 05:58:35 +00:00
Deepanshu Gupta
2b99b5da27 am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE] 
* commit 'c9862b4429b32985d5267fa6ae28025278bdd603':
  An ugly hack to render CalendarView. [DO NOT MERGE]
 2015-08-26 05:58:30 +00:00
Deepanshu Gupta
7eb81868c3 am b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE] 
* commit 'b1ad4a155957160de9c4ad5c5beb39ce00ef6799':
  LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]
 2015-08-26 05:58:25 +00:00
Deepanshu Gupta
9d6e87b67e am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE] 
* commit 'da687918e13010d56e3d067e0ef477165cf38e10':
  Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]
 2015-08-26 05:58:21 +00:00
Deepanshu Gupta
c43506fc2d am 8c674fda: Fix layout mirroring. [DO NOT MERGE] 
* commit '8c674fda8939c2d30f85e0341b70d9f3edd04d6c':
  Fix layout mirroring. [DO NOT MERGE]
 2015-08-26 05:58:16 +00:00
Deepanshu Gupta
918e62f1cb am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE] 
* commit '7aa36129403de74c485f286d290787e38565ddae':
  Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]
 2015-08-26 05:58:06 +00:00
Deepanshu Gupta
eb15670ccc am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE] 
* commit '92f373fe3209f9372d6168b016ae613f7df0625b':
  Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]
 2015-08-26 05:57:58 +00:00
Deepanshu Gupta
42e53ecbc1 am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE] 
* commit '66d914018cf605c25fb6b2f53627ef702decbdd1':
  Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]
 2015-08-26 05:57:53 +00:00
Deepanshu Gupta
5078ad325b am 6b1b651f: Fix imports. [DO NOT MERGE] 
* commit '6b1b651fedc421265d328f1b74512e62ac8a2e13':
  Fix imports. [DO NOT MERGE]
 2015-08-26 05:57:48 +00:00
Deepanshu Gupta
4a2137639a am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE] 
* commit '5ad4dae1578dd6823da93ee8382f07ec2814e3ba':
  Fix theme namespace in tests. [DO NOT MERGE]
 2015-08-26 05:57:40 +00:00
Deepanshu Gupta
f988761c0a am 723e136f: Run setup for full tests only once. [DO NOT MERGE] 
* commit '723e136f96a06360a62dc981da1c8ea0ae546660':
  Run setup for full tests only once. [DO NOT MERGE]
 2015-08-26 05:57:31 +00:00
Deepanshu Gupta
e54dbc4ac7 am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE] 
* commit '3ba16c1d9d53d520543e1bd363236453101096ec':
  LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]
 2015-08-26 05:57:25 +00:00
Deepanshu Gupta
147c0506d5 am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE] 
* commit '55a363376b4d877870650a5a4b757d286f571345':
  LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]
 2015-08-26 05:57:17 +00:00
Deepanshu Gupta
e093bbf399 am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE] 
* commit 'd861fd81f7a2e62a31c4f2c7aed66fceb475d0c8':
  Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]
 2015-08-26 05:57:13 +00:00
Deepanshu Gupta
8a50ecea2e am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE] 
* commit '82fae621533f9d8fc92f5a8d330ebe94a67ff07d':
  LayoutLib: translucent sys ui bars [DO NOT MERGE]
 2015-08-26 05:57:08 +00:00
Deepanshu Gupta
d4be80d996 am 9068539a: Update nav bar icons. [DO NOT MERGE] 
* commit '9068539a48e13a7d32342e46db32b6f5fa3d531e':
  Update nav bar icons. [DO NOT MERGE]
 2015-08-26 05:57:04 +00:00
Deepanshu Gupta
d1dde05506 am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE] 
* commit 'e5afc3117be394fdd92496b39e9bad248972902a':
  Move the layout code out of RenderSessionImpl. [DO NOT MERGE]
 2015-08-26 05:56:59 +00:00
Deepanshu Gupta
87f5fd6bf2 am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE] 
* commit 'c989950dbf18dc294aebfff47c86bfd0349377a0':
  CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]
 2015-08-26 05:56:55 +00:00
Deepanshu Gupta
e3eecca924 am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE] 
* commit 'b2fdaca9590f808fda08e055edbf6fca8030d7d3':
  Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]
 2015-08-26 05:56:50 +00:00
Deepanshu Gupta
b406070040 am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE] 
* commit 'a14ec6f450eaff09b6800fc40616a00cf4899df8':
  Change tools:list_item to listitem. [DO NOT MERGE]
 2015-08-26 05:56:45 +00:00
Deepanshu Gupta
8bfc5a9d14 am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE] 
* commit 'b1e21330f82ec0940658b16dfe7e14e8da8c5d33':
  Implement tools:list_item for RecyclerView. [DO NOT MERGE]
 2015-08-26 05:56:41 +00:00
Jens Ole Lauridsen
67b73b60bf am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE] 
* commit 'cd4d5b3f38186f845e00454b4b95bec77c3ac8fd':
  Support AppBar from Material Design. [DO NOT MERGE]
 2015-08-26 05:56:36 +00:00