Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,719 Commits 3 Branches 0 Tags
539207b99174e16149973c4aedeefa3be0331abc
Commit Graph

43749 Commits

Author SHA1 Message Date
Sandeep Siddhartha
539207b991 am 68f133b4: am a8d8e4c4: am e829259d: Merge "Fix the Locale story in the hotword API" into lmp-dev 
* commit '68f133b422733f89c9e226c636ce6153d4e86f1c':
  Fix the Locale story in the hotword API
 2014-08-25 08:23:41 +00:00
Jeff Davidson
5c470843a4 am baf519c9: am 9f207f97: am 78595786: Merge "Restore legacy VPN stats dialog." into lmp-dev 
* commit 'baf519c9599a7ecb06db3281746708e5ccdeb10c':
  Restore legacy VPN stats dialog.
 2014-08-25 08:23:13 +00:00
Yigit Boyar
b3a523249e am 3037469b: am af314829: am aca6557c: Merge "Clear TextView error when text changes" into lmp-dev 
* commit '3037469b782ae76898ec794557b17407d84046e8':
  Clear TextView error when text changes
 2014-08-25 08:23:05 +00:00
Jeff Brown
da773e1b44 am 049cae6c: am cd4d217a: am d8b20d39: Merge changes I9bd3a235,I9c4dbdef into lmp-dev 
* commit '049cae6c3d612daa481e5683523a678c3a1ebb20':
  Improve adaptive brightness in very dark rooms.
  Hide PowerManager methods that third-party apps can't use.
 2014-08-25 08:22:53 +00:00
Jeff Brown
4b40c24877 am d35615ce: am fdfd79f2: am 6a276cec: Merge "Poke interactive hint from userActivity and add @SystemApi." into lmp-dev 
* commit 'd35615ce7a0ffd477d0dae8d098813d62e92a7db':
  Poke interactive hint from userActivity and add @SystemApi.
 2014-08-25 08:22:48 +00:00
Jeff Brown
10264fef54 am 2867b9f1: am f8dcbab4: am 48b8c455: Merge "Require DEVICE_POWER permission for DOZE_WAKE_LOCK." into lmp-dev 
* commit '2867b9f133a75af922c39d6d58249bd15e637717':
  Require DEVICE_POWER permission for DOZE_WAKE_LOCK.
 2014-08-25 08:22:43 +00:00
Jeff Brown
e80e92e4eb am 7f0182e7: am aa5912c8: am 84ec443d: Merge "Unhide the proximity sensor wakelock." into lmp-dev 
* commit '7f0182e78454a5d72d39b57c1f2369122e850cd9':
  Unhide the proximity sensor wakelock.
 2014-08-25 08:22:38 +00:00
Sandeep Siddhartha
173db08cce am a8d8e4c4: am e829259d: Merge "Fix the Locale story in the hotword API" into lmp-dev 
* commit 'a8d8e4c439da6a3b9292335d631c6ec65ff45b01':
  Fix the Locale story in the hotword API
 2014-08-23 06:19:01 +00:00
Jeff Davidson
c52b5b1fc1 am 9f207f97: am 78595786: Merge "Restore legacy VPN stats dialog." into lmp-dev 
* commit '9f207f97d7b04465f3ed86af1ce855f1a84c40d9':
  Restore legacy VPN stats dialog.
 2014-08-23 02:48:48 +00:00
Sandeep Siddhartha
a434963fad Merge "Fix the Locale story in the hotword API" into lmp-dev 2014-08-23 01:08:18 +00:00
Jeff Davidson
79dbce8661 Merge "Restore legacy VPN stats dialog." into lmp-dev 2014-08-23 00:55:11 +00:00
Yigit Boyar
c57a47a02c am af314829: am aca6557c: Merge "Clear TextView error when text changes" into lmp-dev 
* commit 'af314829d18caaeb84b0a6bdd7e8745f799c9df6':
  Clear TextView error when text changes
 2014-08-23 00:50:22 +00:00
Jeff Brown
a988347120 am cd4d217a: am d8b20d39: Merge changes I9bd3a235,I9c4dbdef into lmp-dev 
* commit 'cd4d217abfa6199eef19c003d03b29ff0a1e33db':
  Improve adaptive brightness in very dark rooms.
  Hide PowerManager methods that third-party apps can't use.
 2014-08-23 00:41:09 +00:00
Jeff Brown
27355a01f1 am fdfd79f2: am 6a276cec: Merge "Poke interactive hint from userActivity and add @SystemApi." into lmp-dev 
* commit 'fdfd79f218144a9a7865e9523c29e0d97080152d':
  Poke interactive hint from userActivity and add @SystemApi.
 2014-08-23 00:41:04 +00:00
Jeff Brown
593611306b am f8dcbab4: am 48b8c455: Merge "Require DEVICE_POWER permission for DOZE_WAKE_LOCK." into lmp-dev 
* commit 'f8dcbab49df493832ed34a83e71b772e7e00db2f':
  Require DEVICE_POWER permission for DOZE_WAKE_LOCK.
 2014-08-23 00:40:59 +00:00
Jeff Brown
18234b4811 am aa5912c8: am 84ec443d: Merge "Unhide the proximity sensor wakelock." into lmp-dev 
* commit 'aa5912c8146810601fbc5549df91fcb60afc6412':
  Unhide the proximity sensor wakelock.
 2014-08-23 00:40:55 +00:00
Yigit Boyar
3edb23bc8e Merge "Clear TextView error when text changes" into lmp-dev 2014-08-23 00:31:00 +00:00
Jeff Brown
a96a3c1b65 Merge changes I9bd3a235,I9c4dbdef into lmp-dev 
* changes:
  Improve adaptive brightness in very dark rooms.
  Hide PowerManager methods that third-party apps can't use.
 2014-08-23 00:23:45 +00:00
Jeff Brown
d7761be23d Merge "Poke interactive hint from userActivity and add @SystemApi." into lmp-dev 2014-08-23 00:23:41 +00:00
Jeff Brown
de25dc0708 Merge "Require DEVICE_POWER permission for DOZE_WAKE_LOCK." into lmp-dev 2014-08-23 00:23:26 +00:00
Sandeep Siddhartha
dcf3068fcb Fix the Locale story in the hotword API 
Tighten the API by taking in a locale rather than a string tag.
Tighten the checks when reading the enrollment metadata, bail out if any
attribute is missing or invalid.
Add missing recycle call for a TypedArray

Stop recognition when sound model(s) change. This is needed during
un-enrollment/re-enrollment.

Bug: 17187528
Bug: 17205230
Change-Id: Idb00b51ef8c4ea0a8f8993decea582223181fa3d
 2014-08-22 17:23:13 -07:00
Jeff Brown
2835bb7867 Merge "Unhide the proximity sensor wakelock." into lmp-dev 2014-08-23 00:23:00 +00:00
Jeff Davidson
90b1b9f985 Restore legacy VPN stats dialog. 
Was originally removed in ag/522961, but restoring to keep legacy VPN
behavior the same from within VpnSettings. This dialog is only
accesible from VpnSettings and so should only ever be shown for legacy
VPNs.

Bug: 17164793
Change-Id: I06c4e136e1023b8f84edfd15a15264d2e41d325b
 2014-08-22 17:06:37 -07:00
Jim Miller
ed741c0918 am 9cb8e236: am 752889a9: am 9af7f4f6: Merge "Update TrustAgentService API after review." into lmp-dev 
* commit '9cb8e236fcb386701f5be9f18465bc304bb46c19':
  Update TrustAgentService API after review.
 2014-08-22 23:37:41 +00:00
Elliott Hughes
a70a6f03f8 am aa89f35f: am 8f038952: am fff90ffb: Merge "Use CLDR narrow am/pm markers." into lmp-dev 
* commit 'aa89f35f18385635b4fb57db7a18db9aa3620ebb':
  Use CLDR narrow am/pm markers.
 2014-08-22 23:33:18 +00:00
Yigit Boyar
412bb5ca63 Clear TextView error when text changes 
This change also fixes another bug where error popup
is cleared when cursor moves using dpad, even though
the text is not changed.

Bug: 15538489
Bug: 3370191
Change-Id: I2804b90178e77ced46477a594331ae1f7306717a
 2014-08-22 16:29:08 -07:00
Jim Miller
db2fb70b19 am 752889a9: am 9af7f4f6: Merge "Update TrustAgentService API after review." into lmp-dev 
* commit '752889a944402983874e04da6f613872275aa3d0':
  Update TrustAgentService API after review.
 2014-08-22 23:28:08 +00:00
Elliott Hughes
49e927ecd6 am 8f038952: am fff90ffb: Merge "Use CLDR narrow am/pm markers." into lmp-dev 
* commit '8f0389527241cb5b8adada12b9084b5c7f38bb84':
  Use CLDR narrow am/pm markers.
 2014-08-22 23:23:52 +00:00
Jim Miller
c7639333f8 Merge "Update TrustAgentService API after review." into lmp-dev 2014-08-22 23:08:32 +00:00
Elliott Hughes
ed40256670 Merge "Use CLDR narrow am/pm markers." into lmp-dev 2014-08-22 23:02:14 +00:00
Jim Miller
d4efaac5d5 Update TrustAgentService API after review. 
Also documents timebase on related DevicePolicyManager API.

Fixes bugs 16401527 and 17046034

Change-Id: I8ee6d0055ab6f52ec71630344d3232f7875d9c1d
 2014-08-22 22:43:30 +00:00
John Spurlock
d8e885c8ea am 92e19ff2: am c7d47057: am fa0f8288: Merge "Display notification effects suppressor in the volume panel." into lmp-dev 
* commit '92e19ff2a2559a67e8108b9e41b5d17a66bb86ed':
  Display notification effects suppressor in the volume panel.
 2014-08-22 22:37:32 +00:00
John Spurlock
48b9ca16f6 am c7d47057: am fa0f8288: Merge "Display notification effects suppressor in the volume panel." into lmp-dev 
* commit 'c7d47057359ba66ce7ca56a20b7bcdf9af522042':
  Display notification effects suppressor in the volume panel.
 2014-08-22 22:23:15 +00:00
John Spurlock
7653a30ea0 Merge "Display notification effects suppressor in the volume panel." into lmp-dev 2014-08-22 22:09:35 +00:00
John Spurlock
b4782526f5 Display notification effects suppressor in the volume panel. 
Bug:16958514

Change-Id: I0eac173875e8af62e3c6b39001722c3fda4517de
 2014-08-22 18:08:17 -04:00
Adam Powell
b17974ee48 am 5deccb85: am cb3b976d: am 2ad136df: Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev 
* commit '5deccb852328dd2c0ce2d307740bbe765bd83e25':
  Fix (another) measurement issue in ActionBarContainer
 2014-08-22 21:53:35 +00:00
Adam Powell
9971017140 am cb3b976d: am 2ad136df: Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev 
* commit 'cb3b976da10899bc7cfcc934ebf3eae9fa5d15db':
  Fix (another) measurement issue in ActionBarContainer
 2014-08-22 21:45:38 +00:00
Matthew Williams
0b96e42706 am 7dc5efe2: am 74d65044: am d95fb7b3: Merge "JobScheduler only run jobs for started users." into lmp-dev 
* commit '7dc5efe28c1b052aa3a8f5d7d60653906f76cbce':
  JobScheduler only run jobs for started users.
 2014-08-22 21:45:08 +00:00
Matthew Williams
e94569636f am 74d65044: am d95fb7b3: Merge "JobScheduler only run jobs for started users." into lmp-dev 
* commit '74d65044fda9dedd72a7e80ec9a607bebdf5f484':
  JobScheduler only run jobs for started users.
 2014-08-22 21:24:15 +00:00
Adam Powell
c9991c7149 Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev 2014-08-22 21:20:24 +00:00
Elliott Hughes
41dc513aad am ad596491: am 942b8379: am 97352608: Merge "Don\'t show the pseudolocales unless we\'re in developer mode." into lmp-dev 
* commit 'ad596491749d7e167282b06699476bd110d88ab2':
  Don't show the pseudolocales unless we're in developer mode.
 2014-08-22 21:13:43 +00:00
Matthew Williams
12eec2341d Merge "JobScheduler only run jobs for started users." into lmp-dev 2014-08-22 21:08:06 +00:00
Elliott Hughes
fbba4317a8 am 942b8379: am 97352608: Merge "Don\'t show the pseudolocales unless we\'re in developer mode." into lmp-dev 
* commit '942b8379bfc2418d4cc33d45928949508bb390c5':
  Don't show the pseudolocales unless we're in developer mode.
 2014-08-22 21:03:20 +00:00
Adam Powell
2b7ff72683 Fix (another) measurement issue in ActionBarContainer 
Or, the patch in which we discover how many silly bugs adamp caused in
e77b6590.

Change-Id: Iaacd3792d161e068dee74b897872e9ab2f155aca
 2014-08-22 13:57:43 -07:00
Elliott Hughes
5d04fee900 Merge "Don't show the pseudolocales unless we're in developer mode." into lmp-dev 2014-08-22 20:42:19 +00:00
Dianne Hackborn
bd79bf6794 am 33c25243: am ceb86f91: am f5b988b8: Merge "Work on issue #17011123: Hit Back/Recents button when in Recents..." into lmp-dev 
* commit '33c25243e9d3d3095e9bdadc0da8d5956dcca820':
  Work on issue #17011123: Hit Back/Recents button when in Recents...
 2014-08-22 20:34:27 +00:00
Dianne Hackborn
9986e64643 am ceb86f91: am f5b988b8: Merge "Work on issue #17011123: Hit Back/Recents button when in Recents..." into lmp-dev 
* commit 'ceb86f912d9cc0cc0fa62f712b0105a5d239a973':
  Work on issue #17011123: Hit Back/Recents button when in Recents...
 2014-08-22 20:22:53 +00:00
Dianne Hackborn
250bf41b8e Merge "Work on issue #17011123: Hit Back/Recents button when in Recents..." into lmp-dev 2014-08-22 20:05:39 +00:00
Ronghua Wu
2cd71b9780 am 71495cd3: am 4f643cf0: am 29b2d44c: Merge "VideoView: unhide setVideoURI api and add document." into lmp-dev 
* commit '71495cd3f19c64d9256d2ad90f2804725b525ade':
  VideoView: unhide setVideoURI api and add document.
 2014-08-22 19:42:36 +00:00
Yigit Boyar
d37fe49803 am 03f2d323: am 5ebd8379: am 907b5603: Merge "Fix RTL bug for actionbar tooltips" into lmp-dev 
* commit '03f2d323583ee65058d80e4888ee72e0a52f6891':
  Fix RTL bug for actionbar tooltips
 2014-08-22 19:42:32 +00:00