Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
160,416 Commits 3 Branches 0 Tags
ec017cbbcbf871d96eed58ed30aa263d57e23050
Commit Graph

3758 Commits

Author SHA1 Message Date
Adam Powell
da3b0d3f3f am d2906536: am 5a6ff09d: am 11133a78: am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev 
* commit 'd2906536f40e584ff4b4c348a95ce71958aaffb6':
  Always show the name of the last used Home app in ResolverActivity
 2014-09-26 04:31:00 +00:00
Adrian Roos
d99db031ea am b8d22d1c: am f68e624f: am a2e1e2ca: am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev 
* commit 'b8d22d1c5bd035346832301e126ba83380bf63c0':
  Ensure that setting an empty password clears it
 2014-09-26 04:29:42 +00:00
Paul Lawrence
1d1ebd7f98 am 98a18468: am 433d70d3: am 7c4b9413: am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev 
* commit '98a18468ef2f6ec7f46c21015c0d8df42ea86ff5':
  Fix pause when setting pin/pattern/password
 2014-09-26 00:23:53 +00:00
Adam Powell
a35c77aea6 Always show the name of the last used Home app in ResolverActivity 
Bug 17629220

Change-Id: Ia1d0a188f8c0911e5b74b18ba44508a6e2139d0c
 2014-09-25 16:54:41 -07:00
Adrian Roos
625e8f5959 Merge "Ensure that setting an empty password clears it" into lmp-dev 2014-09-25 22:42:43 +00:00
Paul Lawrence
3a5a0be61e Fix pause when setting pin/pattern/password 
Move setting encryption pin/pattern/password into a separate thread

Bug: 17554587
Change-Id: Ifdf2ed5aa9ca08d68bb2ed08c8985203c24dcb9f
 2014-09-25 17:32:19 +00:00
Jeff Sharkey
52e40aaa8a am 1eb1a4fa: am b47a75f2: am b8bbeff0: am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit '1eb1a4fa28d74312b329daaecd8a81fcf367eea4':
  Include reason when wiping data.
 2014-09-25 17:05:42 +00:00
Adrian Roos
ab7dae58cc Ensure that setting an empty password clears it 
Bug: 17496766
Change-Id: I7c29b632519247bc5675a05ef6cc90902fec8527
 2014-09-25 18:25:21 +02:00
Andreas Gampe
a2945aabd9 resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp 
Change-Id: I3e9adb5fa67f8ca7ce8151c2dbf5c8fe5b40cb86
 2014-09-24 15:47:36 -07:00
Jeff Sharkey
004a4b20f8 Include reason when wiping data. 
This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: If8413e5d6377773f37e8b34ae3d26347226a027c
 2014-09-24 13:58:09 -07:00
Dianne Hackborn
d96238d02e am a85c287d: am 0394c8bc: am c39f4fc2: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 
* commit 'a85c287d53335cdc2fbdde711216a6f5db5a1a24':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop
 2014-09-23 21:31:00 +00:00
Dianne Hackborn
d0e0154c1f Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 2014-09-23 20:55:05 +00:00
Dianne Hackborn
25e1ecaabb Maybe fix issue #17614177 APR: system process restarting due to infinite loop 
Also try to get rid of a huge wtf we are seeing across a lot of devices
where we incorrectly change real states on a service that is restarting,
and get rid of one of the noisier boot logs in the package manager.

Change-Id: I2510b6fb082eac3f6168cbd57bc3b70ad006114d
 2014-09-23 10:33:30 -07:00
jgu21
2eacd06bfb Frameworks/base: Early init native bridge 
Add the app directory to the arguments for starting a process.
Add a check for NeedsNativeBridge and a call to PreInitializeBridge
in the native fork code.

Change-Id: I0b93da93251c6b4638de786bf98cf99df07c3fc2
 2014-09-22 16:04:37 -07:00
Alan Viverette
e69028b5de am be2fb16c: am 8ae47443: am 8183ba88: am 0dfa4738: Merge "Pass explicit null theme when preloading drawables" into lmp-dev 
* commit 'be2fb16c0c96cea50a83560ffb198e281095842d':
  Pass explicit null theme when preloading drawables
 2014-09-22 20:02:12 +00:00
Yohei Yukawa
8712675cac am fb8bdc11: am 79a12ba6: am 8fe1ca2c: am b5d063dc: Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev 
* commit 'fb8bdc1183e304e62c089353cc8765aa7783f8ab':
  Work on issue #17506095: Plumb a new configuration to IMMS
 2014-09-22 19:45:32 +00:00
Yigit Boyar
2e65058de9 am e17fd940: am 0b380581: am a9faefb3: am a0716928: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev 
* commit 'e17fd9404ca07458b333ee0e827e269cbf82570d':
  Allow fallback to Toolbar's default Navigation Icon
 2014-09-22 19:44:59 +00:00
Alan Viverette
e786895918 Merge "Pass explicit null theme when preloading drawables" into lmp-dev 2014-09-22 19:18:03 +00:00
Yohei Yukawa
ca5e72c5ae Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev 2014-09-22 18:02:12 +00:00
Alan Viverette
84e001a9f5 Pass explicit null theme when preloading drawables 
Prevents "unresolved theme attributes" warning.

BUG: 17589490
Change-Id: I5217d85b1d5ce8b551315ee8b1ca79eccfac3f10
 2014-09-22 07:05:33 +00:00
Yigit Boyar
5507b223dd Merge "Allow fallback to Toolbar's default Navigation Icon" into lmp-dev 2014-09-22 01:14:40 +00:00
Yohei Yukawa
e63b5fae8d Work on issue #17506095: Plumb a new configuration to IMMS 
This CL makes a plumbing from SystemConfig to IMMS.

Change-Id: Ia70b870723acf647e0c27f24aff91b40d6f85543
 2014-09-21 10:34:35 +09:00
Yigit Boyar
30f5dc935b Allow fallback to Toolbar's default Navigation Icon 
Bug: 17554486
Change-Id: Id9f2197820df42d81351540be5baa852f49bdf0a
 2014-09-19 18:26:07 -07:00
Alan Viverette
0e3b5a7986 am 4ecec44c: am b55ced84: am 13527b41: am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev 
* commit '4ecec44cf37c7df41295eb5897d04c32f7806b73':
  Correctly apply max width/height to preference icons
 2014-09-19 23:03:56 +00:00
Alan Viverette
ecd7c96aa4 Correctly apply max width/height to preference icons 
BUG: 17581750
Change-Id: I8ad21a321c80f0a657670ba4d175d0ebecea49ef
 2014-09-19 13:36:29 -07:00
Alan Viverette
090537ee29 am 2f9ae13d: am f491d835: am 73d3c81c: am fb15b0e2: Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev 
* commit '2f9ae13d5843d6f25cfaaf2db51b5a78e2a8ba33':
  Use action bar theme for action modes, fix ViewStub inflation theme
 2014-09-18 21:23:38 +00:00
Alan Viverette
07ecc748fb Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev 2014-09-18 20:25:22 +00:00
Sander Alewijnse
fcb398f601 am fd9d7709: am c32f231c: am 2379e16f: am 81b375a1: Merge "Update targetSdkVersion check." into lmp-dev 
* commit 'fd9d770937e9d3c474d203513e74eccb002fbd8a':
  Update targetSdkVersion check.
 2014-09-18 12:18:27 +00:00
Sander Alewijnse
d4710c87e6 Merge "Update targetSdkVersion check." into lmp-dev 2014-09-18 11:36:19 +00:00
Alan Viverette
a9ddb8dc23 Use action bar theme for action modes, fix ViewStub inflation theme 
BUG: 17262483
BUG: 17513621
Change-Id: I74764570a11da162a224e94978e21e52d17e2e84
 2014-09-17 18:14:32 -07:00
Yigit Boyar
97e853d00c am 28d73a51: am 98171686: am bb837c51: am 7fa36f26: Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev 
* commit '28d73a5176225216f1105a6a0910c04383db44cd':
  Handle action mode changes properly for actionbar tabs
 2014-09-17 21:42:21 +00:00
Yigit Boyar
fd20f196b1 Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev 2014-09-17 21:00:40 +00:00
Sandeep Siddhartha
b1a7ddfe54 am 2ee987c0: am fd719cfd: am aea51189: am e80c6f17: Merge "Fix issues with multiple languages and multi-users" into lmp-dev 
* commit '2ee987c02239e6ebe1232505e3b9f9bd72d39a8a':
  Fix issues with multiple languages and multi-users
 2014-09-17 20:51:01 +00:00
Sandeep Siddhartha
80ea66b102 Merge "Fix issues with multiple languages and multi-users" into lmp-dev 2014-09-17 20:06:43 +00:00
Yigit Boyar
2bbad0cddc Handle action mode changes properly for actionbar tabs 
Bug: 17513613
Change-Id: I4ebcadc618558153b72bf577232adc3e616adb6b
 2014-09-16 18:28:03 -07:00
Adam Lesinski
30b9e90a12 am 221544f9: am 4f1f2dc4: am 17e0218d: am 1416621b: Merge "Show the lockscreen when more than 1 user is present" into lmp-dev 
* commit '221544f9a673ec4f157a1c760cf5a47cb9c336f1':
  Show the lockscreen when more than 1 user is present
 2014-09-16 21:08:24 +00:00
Yohei Yukawa
f4bc3ba7f8 am ea4cc661: am 9c0fe70f: am 5d36afad: am 8219934a: Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev 
* commit 'ea4cc66116f9ae5873c63214d7751294333e965c':
  Minimize the number of default enabled IMEs part 3
 2014-09-16 21:08:06 +00:00
Adam Powell
8312978af7 am e4abf3f9: am d2b93415: am 752021f9: am 3b2dfa7a: Merge "Treat empty string as title-set in ToolbarWidgetWrapper" into lmp-dev 
* commit 'e4abf3f9628fd34c7d4f98951ab7b1fb7e6bc63c':
  Treat empty string as title-set in ToolbarWidgetWrapper
 2014-09-16 21:07:57 +00:00
Adam Powell
d16d3ad715 am 28ac06fe: am 2ac58db5: am e608ab91: am 17ec7920: Merge "Finish materializing dialogs" into lmp-dev 
* commit '28ac06fe0b355ba4efff5d94c1f74a07e176c735':
  Finish materializing dialogs
 2014-09-16 21:07:49 +00:00
Sandeep Siddhartha
8cf8f71644 Fix issues with multiple languages and multi-users 
For multi-user the issue was looking into the user ID of the current
process instead of the active user. The current process was the system
process and the call to UserManager was returning a user handle that
wasn't of any use while trying to map sound models to a user.

For language, the issue was that we were incorrectly just looking up the
model based on the keyphrase id, however we should have also taken the
enrolled model's locale into account.

Explicitly document that for model management the string representation of locales
is a BCP47 language tag.

Remove debug logging.

Bug: 16798166
Bug: 17462570
Bug: 17463511
Change-Id: Ieffb3e218de63f6e7f40af9705dced481a35b0ad
 2014-09-15 19:59:09 -07:00
Adam Lesinski
3846c1d261 Merge "Show the lockscreen when more than 1 user is present" into lmp-dev 2014-09-16 00:50:23 +00:00
Adam Lesinski
61d9409239 Show the lockscreen when more than 1 user is present 
Bug:17399024
Change-Id: Iaf2ea2747cbcd9db45ba9faa7c8fe0389a799855
 2014-09-15 17:46:10 -07:00
Yohei Yukawa
84f20ec49d Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev 2014-09-16 00:19:55 +00:00
Adam Powell
afd3a3a049 Merge "Treat empty string as title-set in ToolbarWidgetWrapper" into lmp-dev 2014-09-15 23:55:34 +00:00
Adam Powell
6192b07bdc Treat empty string as title-set in ToolbarWidgetWrapper 
If a developer explicitly sets the empty string as the title of a
Toolbar that is used as an action bar via Activity#setActionBar, don't
overwrite it with the window title. This clears up a nonintuitive
behavior when explicitly clearing the title of a toolbar.

Bug 17510951

Change-Id: I183c2ca57d3bd16ae1f89bb7daa2cdf086189138
 2014-09-15 16:36:01 -07:00
Adam Powell
d044ad97a8 Finish materializing dialogs 
Fix bottom spacing for dialogs with no button bar

Remove default dividers from dialog lists

Bug 17503404

Change-Id: Icdcaaad99f70a259ff3f892d6385257801e38437
 2014-09-15 14:30:23 -07:00
Sander Alewijnse
38ea779b42 Update targetSdkVersion check. 
Bug:16509819
Change-Id: I471c4a5b2450b4cc64414dfa2dae75d51cce3abb
 2014-09-15 18:54:15 +01:00
Yohei Yukawa
dc489241cf Minimize the number of default enabled IMEs part 3 
With this CL, the behavior of getDefaultEnabledImes() changes
as follows:

- Previously system IMEs are always enabled by default as long
  as it is a software keyboard that supports En_* subtype. With
  this CL, getDefaultEnabledImes() relies on the locale returned
  from getFallbackLocaleForDefaultIme() instead of calling
  isSystemImeThatHasEnglishKeyboardSubtype() to minimize the
  number of enabled IMEs.
- Previously default enabled system IMEs are chosen in a
  country-agnostic way. As a result, "en_IN" is enabled even
  when the system locale is "en_US". With this CL, the system
  first tries to find IMEs with taking the coutnry into account,
  and use the country-agnostic way when and only when fallback
  logic is required.

BUG: 17347871
Change-Id: I6571d464a46453934f0a8f5e79018a67a9a3c845
 2014-09-15 13:13:45 +09:00
Adam Powell
35e752ef62 am 51bf4916: am 86a3adca: Merge "Magic null-background filling for PhoneWindows" into lmp-dev 
* commit '51bf49165c01c6ee7386fcee35c17cf636a151cb':
  Magic null-background filling for PhoneWindows
 2014-09-14 23:21:09 +00:00
Adam Powell
9dbe94d8cd Merge "Magic null-background filling for PhoneWindows" into lmp-dev 2014-09-14 22:51:29 +00:00