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

3843 Commits

Author SHA1 Message Date
Alan Viverette
beb45a194d am eb09aaa5: am e1201e87: Merge "Lighten action bar on light theme, use secondary color for subtitle" into lmp-mr1-dev 
* commit 'eb09aaa5acd4bfaa4e71c60f23a934294b8130cd':
  Lighten action bar on light theme, use secondary color for subtitle
 2014-10-23 15:58:33 +00:00
Alan Viverette
1338a8bd80 am dc546ab7: am 720f43e4: Merge "Revert "Check MenuItem.isVisible() for keyboard shortcuts"" into lmp-mr1-dev 
* commit 'dc546ab7c3b53012908ce6b594f34a5d27de78e1':
  Revert "Check MenuItem.isVisible() for keyboard shortcuts"
 2014-10-23 08:01:53 +00:00
Alan Viverette
e1201e87f4 Merge "Lighten action bar on light theme, use secondary color for subtitle" into lmp-mr1-dev 2014-10-23 01:28:50 +00:00
Alan Viverette
bd266fef81 Lighten action bar on light theme, use secondary color for subtitle 
Also cleans up some code in ActionBarView.

BUG: 17987639
Change-Id: I7dcdf18748d6da5792900ab9a78775a0511f982a
 2014-10-22 17:20:17 -07:00
Alan Viverette
720f43e4a4 Merge "Revert "Check MenuItem.isVisible() for keyboard shortcuts"" into lmp-mr1-dev 2014-10-23 00:05:33 +00:00
Alan Viverette
e38eb4d4ef Revert "Check MenuItem.isVisible() for keyboard shortcuts" 
Just kidding we do want this to work like it used to.

This reverts commit e354a9e4da.

Change-Id: Ia51050a93e25c1ad16144b0da3f6178a98ad971a
 2014-10-22 23:51:32 +00:00
Filip Gruszczynski
b1ed0ab927 am 78b236b3: am d4a52a68: am baecc0b2: Merge "Disable activity\'s translucency until it starts being swiped away." into lmp-sprout-dev 
* commit '78b236b3d2be713f534a033b0deb0e00b0d436a8':
  Disable activity's translucency until it starts being swiped away.
 2014-10-22 21:18:15 +00:00
Filip Gruszczynski
d4a52a6878 am baecc0b2: Merge "Disable activity\'s translucency until it starts being swiped away." into lmp-sprout-dev 
* commit 'baecc0b2d111c3bc930b85d5450f1ff8b7b83395':
  Disable activity's translucency until it starts being swiped away.
 2014-10-22 20:45:59 +00:00
Alan Viverette
a0579ad00f am 5eaf0064: am 410f7ee4: Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev 
* commit '5eaf00641a8dd31b4d7779749db28669e4010af3':
  Check MenuItem.isVisible() for keyboard shortcuts
 2014-10-22 20:14:35 +00:00
Alan Viverette
410f7ee403 Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev 2014-10-22 20:03:46 +00:00
Filip Gruszczynski
3f8dd14451 Disable activity's translucency until it starts being swiped away. 
Change-Id: Ia5dceac7bd9ff57920a43736f9db6a33175e01ac
 2014-10-21 15:12:00 -07:00
Adam Powell
639e3181e0 am e055c95b: am 054e8be5: Merge "Intent chooser callback" into lmp-mr1-dev 
* commit 'e055c95b77a3610452f31d2303fa35bf171acf0e':
  Intent chooser callback
 2014-10-21 21:49:55 +00:00
Alan Viverette
e354a9e4da Check MenuItem.isVisible() for keyboard shortcuts 
Parity with support-v7 change.

BUG: 18021345
Change-Id: I583b586d451a21bbd207d2b0584a396e1125ee59
 2014-10-21 12:21:32 -07:00
Adam Powell
0b3c11260a Intent chooser callback 
Let an app specify an IntentSender as an extra for ACTION_CHOOSER that
will be notified of the user's chosen target. Apps can use this to
implement things like one-touch last used affordances without
implementing their own one-off chooser UI.

Bug 17363684

Change-Id: Ic5d1d0e0c7a0bae3eda6b1d6ade993f3ba865cfa
 2014-10-21 12:17:50 -07:00
Dianne Hackborn
019de15ca2 am 2ea2bf28: am ed512c81: Merge "Fix issue #17948288: Improve accuracy of memory use reporting" into lmp-mr1-dev 
* commit '2ea2bf284078eea4871bfa0fb42b56dff3e8bbf3':
  Fix issue #17948288: Improve accuracy of memory use reporting
 2014-10-18 00:52:07 +00:00
Dianne Hackborn
ed512c817c Merge "Fix issue #17948288: Improve accuracy of memory use reporting" into lmp-mr1-dev 2014-10-18 00:42:24 +00:00
Jim Miller
8596960eb5 am 956e424d: am d9b81b11: am a054a828: am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 
* commit '956e424d007df454cc4a2bfc576336eb0c8f20e4':
  Add utility methods to LockPatternUtils for encryption
 2014-10-18 00:07:35 +00:00
Jim Miller
d9b81b11b9 am a054a828: am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 
* commit 'a054a8280c1316a1f805cc86f00f571a3b1cfc2f':
  Add utility methods to LockPatternUtils for encryption
 2014-10-17 23:57:33 +00:00
Jim Miller
a054a8280c am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 
* commit 'c6c843fbe8fb8d9bdd012a472e22970ee89b9d24':
  Add utility methods to LockPatternUtils for encryption
 2014-10-17 23:52:41 +00:00
Jim Miller
c6c843fbe8 Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 2014-10-17 23:48:21 +00:00
Jim Miller
dd5de719c5 Add utility methods to LockPatternUtils for encryption 
This enables a change in Settings that allows device
encryption to be disabled by the user.

Fixes bug 17881324

Change-Id: I34dfc586df1a598bf969dc82adf8537a2730d345
 2014-10-17 16:08:21 -07:00
Dianne Hackborn
b3af4ec6ba Fix issue #17948288: Improve accuracy of memory use reporting 
We now use Mapped to not double-count cached pages that are
mapped in to app processes.  Also read in some more values that
count towards kernel RAM use, and count buffers as free rather
than used RAM.

It also looks like the zram accounting is broken -- it was never
collecting the total zram reserved space.  I need to figure out
how I was finding that before.

Change-Id: I883f6fc93966774b5c7d2801d1801666dd11ed41
 2014-10-17 15:25:13 -07:00
William Bourke
83c97babb0 am cb1e32ac: am 44d51545: am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev 
* commit 'cb1e32ac2b5eb12ff89af5eb8074908b5f54d047':
  Modified lollipop Easter egg for TV compatibility
 2014-10-17 22:20:44 +00:00
William Bourke
44d515457a am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev 
* commit '7d5c68e31eea3848fd8fa75dfd9f7190ef1cd3a3':
  Modified lollipop Easter egg for TV compatibility
 2014-10-17 22:09:19 +00:00
William Bourke
7d5c68e31e am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev 
* commit '84b4791aaf0384a334068a97c70fcda162cfadab':
  Modified lollipop Easter egg for TV compatibility
 2014-10-17 22:03:50 +00:00
William Bourke
33f577cfea Modified lollipop Easter egg for TV compatibility 
Bug: 17997922

Change-Id: I0e2e34245183cdd146ecca02ab09b2c4867770ec
 2014-10-17 21:57:23 +00:00
Amith Yamasani
50207f043f am 3e732ab2: am e1970346: am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev 
* commit '3e732ab2050507dbfde23ee0d050daae86d9d8bc':
  Use the correct method to check if device is encrypted
 2014-10-17 20:28:41 +00:00
Amith Yamasani
e1970346a4 am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev 
* commit 'b5afeca3d9ce3efb0ab9ab6536d4446ec73b416c':
  Use the correct method to check if device is encrypted
 2014-10-17 19:05:25 +00:00
Amith Yamasani
b5afeca3d9 am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev 
* commit 'a865bb5df834194dee339db615c17d7c7b63aaa3':
  Use the correct method to check if device is encrypted
 2014-10-17 19:00:36 +00:00
Amith Yamasani
cd410ba4e8 Use the correct method to check if device is encrypted 
DPM's method will return false if encrypted by default password,
preventing the changing of encryption password to lockscreen password.

Check if the device is encrypted by some means, instead.

Also fix a SecurityException when Device Admin queries encryption state
(recent regression)

Bug: 17881324
Change-Id: Id897e61c5e254ab3f8dc569285428a73005303ea
 2014-10-17 11:43:57 -07:00
Adrian Roos
0f08243da6 am c344cdc1: am ccb7a9af: Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev 
* commit 'c344cdc1bbe6dca60326b6d4f10a67a923c84847':
  Prevent ChooserActivity from taking over the system bars
 2014-10-16 15:01:36 +00:00
Adrian Roos
ccb7a9af27 Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev 2014-10-16 14:54:19 +00:00
Alan Viverette
6950153f95 am 205a5e69: am 8afc90fd: Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev 
* commit '205a5e69cc7f2cf30202cf1e122670aac254e5f1':
  Add style support to PopupMenu, clean up constructor javadoc
 2014-10-16 00:57:03 +00:00
Alan Viverette
8afc90fd71 Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev 2014-10-16 00:44:36 +00:00
Alan Viverette
29632521c3 Add style support to PopupMenu, clean up constructor javadoc 
BUG: 18002523
Change-Id: Ice492686b814460248ccbe9727c64dd002e7ed7a
 2014-10-15 17:19:30 -07:00
Jim Miller
26e4de2ff1 am 1a02efb1: am ce711c6d: am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev 
* commit '1a02efb1247569ae0e133c199295c873e4ad9b52':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 18:40:08 +00:00
Jim Miller
ce711c6d57 am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev 
* commit '09ba0da87fa56eac91da5eb2d0a20b7799df66d5':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 18:31:32 +00:00
Jim Miller
09ba0da87f am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev 
* commit 'e7c325559d961f13c6df96803bca4747f41b27a4':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 18:26:59 +00:00
Jim Miller
e7c325559d Merge "Add a checkbox option to 'require password to decrypt'" into lmp-dev 2014-10-15 18:21:52 +00:00
Adrian Roos
27c3ab630a Prevent ChooserActivity from taking over the system bars 
Bug: 17939334
Change-Id: I4d028695a1f81442cbbe7067b33475634effd5d2
 2014-10-15 17:22:27 +02:00
Jeff Sharkey
6449ba6d8c am 92ab2748: am 4d526bd2: am cf2c5649: am 97978808: Start cross profile intents as caller. 
* commit '92ab2748efc185a347d11e1382d54b86ffd22799':
  Start cross profile intents as caller.
 2014-10-15 03:21:58 +00:00
Jeff Sharkey
4d526bd249 am cf2c5649: am 97978808: Start cross profile intents as caller. 
* commit 'cf2c564987965be1241fe197106b3ec22b11b4b0':
  Start cross profile intents as caller.
 2014-10-15 02:19:26 +00:00
Jeff Sharkey
cf2c564987 am 97978808: Start cross profile intents as caller. 
* commit '9797880808320e3a7bae1f59bc7e0c5a13189e5f':
  Start cross profile intents as caller.
 2014-10-15 02:05:56 +00:00
Jeff Sharkey
9797880808 Start cross profile intents as caller. 
The system should always be using new startActivityAsCaller() when
starting activities on behalf of someone else, to ensure that
security checks are enforced as the original caller.

Bug: 17983737
Change-Id: Ic40816a797cfdb13c0adb48b86ed4ed7d6aae8eb
 2014-10-14 17:57:28 -07:00
Jim Miller
6848dc8e3b Add a checkbox option to 'require password to decrypt' 
Fixes bug 17881324

Change-Id: Id94e593a172d686339c736473226fece1bb749ee
 2014-10-14 16:26:11 -07:00
Nicolas Prevot
e5a75d1333 am 20ec9b79: am d8a21bbe: Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev 
* commit '20ec9b79f1d98ccbe5b8d4486feaf37a4f80a945':
  Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile.
 2014-10-14 17:51:02 +00:00
Nicolas Prevot
d8a21bbedb Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev 2014-10-14 09:07:43 +00:00
Dianne Hackborn
5457d5ccb6 am 8f6928f1: am e61e68d0: am 18d2d51e: am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev 
* commit '8f6928f1399620ce432b82d046912e2030d6511c':
  Improve some docs, fix some debugging.
 2014-10-10 21:06:48 +00:00
Dianne Hackborn
e61e68d001 am 18d2d51e: am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev 
* commit '18d2d51ee30d8df4d3afa5e7b6bb7e7171a18b63':
  Improve some docs, fix some debugging.
 2014-10-10 20:47:07 +00:00
Nicolas Prevot
1a81592169 Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile. 
Inside ResolverActivity: when getting the ResolveInfo for EXTRA_INITIAL_INTENTS:
The ResolveInfo is created directly inside ResolverActivity, not by PackageManagerService.
So, noResourceId had not been set to true for this ResolveInfo.
So setting it inside ResolverActivity.

This is needed since inside a managed profile, the icons are not associated with resource ids.

BUG:17577733
Change-Id: Ic4f0439128f95482167103b783344e2baa0aed52
 2014-10-10 16:40:08 +01:00