drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,554 Commits 1 Branch 0 Tags
Commit Graph

150554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Taylor
1ee373ebb2 Merge "Revert "DO NOT MERGE - Hide new SmsManager API's dealing with SubId"" into lmp-sprout-dev 2014-09-08 22:30:48 +00:00
Tsuwei Chen
b09bb2b6ba am 38000b0f: Merge "Manually merge QC\'s change for SUPL_ES." into lmp-dev 
* commit '38000b0ffd1080e6e8bd9b0607c8916aa9bd0a1b':
  Manually merge QC's change for SUPL_ES.
 2014-09-08 22:28:37 +00:00
Tsuwei Chen
ff4f6c8859 Merge "Manually merge QC's change for SUPL_ES." into lmp-dev 2014-09-08 22:15:32 +00:00
Tom Taylor
2cb9eade62 Revert "DO NOT MERGE - Hide new SmsManager API's dealing with SubId" 
We *want* this API public for L-sprout.

This reverts commit 4ce136a90a6fb29373ea956cdd3f084b68a18ce9.

Change-Id: I53672aff2aa25b41bb4ce1f78862f0fe43474a8c
 2014-09-08 14:58:39 -07:00
Andrew Lee
d1369113e1 am 32e8bc52: Merge "Rename methods/variables on PhoneAccount for API cleanup." into lmp-dev 
* commit '32e8bc5241d3e048ebe8c94902e5a2b458740f81':
  Rename methods/variables on PhoneAccount for API cleanup.
 2014-09-08 21:50:39 +00:00
Yorke Lee
8dc2c62821 am af99dec4: Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev 
* commit 'af99dec488b5eae712253d24ce9f1e85ccfefdeb':
  Replace Calls.FEATURES_NONE with 0 (1/4)
 2014-09-08 21:50:35 +00:00
Andrew Lee
be5b656940 Merge "Rename methods/variables on PhoneAccount for API cleanup." into lmp-dev 2014-09-08 21:45:41 +00:00
Yorke Lee
478f5a6212 Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev 2014-09-08 21:43:30 +00:00
Christoph Studer
e759c90cb2 am ea3bd1ac: Merge "NoMan: Fix speedbump with multiple package priorities" into lmp-dev 
* commit 'ea3bd1aca9bed0d06b4f164746710c3ea7c5dd43':
  NoMan: Fix speedbump with multiple package priorities
 2014-09-08 21:34:56 +00:00
Tom Taylor
9f6e1c0a54 am 15854740: Merge "DO NOT MERGE - Hide new SmsManager API\'s dealing with SubId" into lmp-dev 
* commit '15854740933385d2560f97ce603afa8549e422b4':
  DO NOT MERGE - Hide new SmsManager API's dealing with SubId
 2014-09-08 21:28:41 +00:00
Christoph Studer
6a73202e00 Merge "NoMan: Fix speedbump with multiple package priorities" into lmp-dev 2014-09-08 21:26:30 +00:00
Tom Taylor
bb3b2dcafb Merge "DO NOT MERGE - Hide new SmsManager API's dealing with SubId" into lmp-dev 2014-09-08 21:17:21 +00:00
Chris Wren
fcdd2f0ea2 am 9330c3e5: Merge "Bring consistency to FLAG_ONLY_ALERT_ONCE semantics." into lmp-dev 
* commit '9330c3e544107c0da0425ca5e6cd0caec8d475d7':
  Bring consistency to FLAG_ONLY_ALERT_ONCE semantics.
 2014-09-08 20:51:10 +00:00
Kenny Guy
3e3fcdf742 am 4e9c9518: Merge "Renaming of LauncherApps apis" into lmp-dev 
* commit '4e9c9518f937377fab1afd78c09d5d47a1a11ed1':
  Renaming of LauncherApps apis
 2014-09-08 20:51:05 +00:00
John Spurlock
048bb429e9 am e5feafcd: Merge "Zen: Remove suppression of untagged vibrations in zen mode." into lmp-dev 
* commit 'e5feafcd1589bf6e92669df82a545276fa4ab29b':
  Zen: Remove suppression of untagged vibrations in zen mode.
 2014-09-08 20:51:01 +00:00
Jorim Jaggi
e9c595a402 am 7ad90a9a: Merge "Start all resolver activities after keyguard is gone" into lmp-dev 
* commit '7ad90a9af57d248504b7c33663700db59bebd735':
  Start all resolver activities after keyguard is gone
 2014-09-08 20:50:57 +00:00
Chris Wren
6db58cb0a1 Merge "Bring consistency to FLAG_ONLY_ALERT_ONCE semantics." into lmp-dev 2014-09-08 20:47:07 +00:00
Kenny Guy
d9037a48c6 Merge "Renaming of LauncherApps apis" into lmp-dev 2014-09-08 20:47:07 +00:00
John Spurlock
897b01b39e Merge "Zen: Remove suppression of untagged vibrations in zen mode." into lmp-dev 2014-09-08 20:40:46 +00:00
Chris Wren
d93d5adfe7 Bring consistency to FLAG_ONLY_ALERT_ONCE semantics. 
For updates, the sounds layer checks for existence of the flag on the
new version while the heads up was checking for the flag on the
old version.

Both now agree to check the new version.

Bug: 14255617
Change-Id: Ib617df11f0dea17b5dfdf2ef6330bdbd18032ac6
 2014-09-08 16:40:39 -04:00
Jorim Jaggi
92cb37a027 Merge "Start all resolver activities after keyguard is gone" into lmp-dev 2014-09-08 20:38:36 +00:00
Yorke Lee
e3198b719f Replace Calls.FEATURES_NONE with 0 (1/4) 
Bug: 17253963
Change-Id: I9e9e56cdf4c9a60ac1e047bef0eba2ba0c8f10fb
 2014-09-08 13:33:51 -07:00
Craig Mautner
8eba965633 am 8ffe407a: Merge "Relax requirements on Activity.requestVisibleBehind" into lmp-dev 
* commit '8ffe407a65df2c363492e798dd316e816f2ac21e':
  Relax requirements on Activity.requestVisibleBehind
 2014-09-08 20:21:18 +00:00
John Spurlock
1564b6d8d7 Zen: Remove suppression of untagged vibrations in zen mode. 
Bug:17313184
Change-Id: I07d24a7d9ce15160a4990391c53d7d6309a13c3e
 2014-09-08 16:16:25 -04:00
Winson Chung
104770b61a am 3361310f: Ensuring that the start delay matches the transition delay. (Bug 16987565) 
* commit '3361310f20013b95ae1e99e0de7b15c6ea422f64':
  Ensuring that the start delay matches the transition delay. (Bug 16987565)
 2014-09-08 20:13:12 +00:00
Kenny Guy
5856bcfd5f am 652e64d3: Merge "Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn\'t make sure we will get an ApplicationInfo for the user being requested. So reverting." into lmp-dev 
* commit '652e64d30c2b1d499dbcba93056eaf40b270ad09':
  Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn't make sure we will get an ApplicationInfo for the user being requested. So reverting.
 2014-09-08 20:13:08 +00:00
Craig Mautner
ff56885db3 Merge "Relax requirements on Activity.requestVisibleBehind" into lmp-dev 2014-09-08 20:12:35 +00:00
Winson Chung
19d62382d0 Ensuring that the start delay matches the transition delay. (Bug 16987565) 
- Also ensure that the empty text is normal weight

Change-Id: I3227a62fcb39910a402b13f42a6cb9e418f992aa
 2014-09-08 20:08:01 +00:00
Kenny Guy
48f0b48555 Merge "Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn't make sure we will get an ApplicationInfo for the user being requested. So reverting." into lmp-dev 2014-09-08 20:02:10 +00:00
Tom Taylor
02dc08834b DO NOT MERGE - Hide new SmsManager API's dealing with SubId 
Bug 17422049

Change-Id: I8acc4448e1c5ed665f6df48282afa71fcec54f33
 2014-09-08 20:00:03 +00:00
Jorim Jaggi
80be90606e am 5d629572: Merge "Restrict line count for BigTextStyle" into lmp-dev 
* commit '5d629572c2e3c8142ed437efbd1ebdd4bde4220c':
  Restrict line count for BigTextStyle
 2014-09-08 19:57:10 +00:00
Jorim Jaggi
f98fbb710b Merge "Restrict line count for BigTextStyle" into lmp-dev 2014-09-08 19:46:45 +00:00
Jorim Jaggi
55b67cd40d am 66d3891d: Merge "Fix invisible low prio notifications in SHADE_LOCKED" into lmp-dev 
* commit '66d3891d1e8566944d4f86ba5df39b037f90573b':
  Fix invisible low prio notifications in SHADE_LOCKED
 2014-09-08 19:45:33 +00:00
Jorim Jaggi
a3bb226b08 Merge "Fix invisible low prio notifications in SHADE_LOCKED" into lmp-dev 2014-09-08 19:34:44 +00:00
Tom O'Neill
cf8e84b83d am 8fff150b: Merge "Fix a STOPSHIP" into lmp-dev 
* commit '8fff150bb5c9971c5ba25cf9568a2944ff951c04':
  Fix a STOPSHIP
 2014-09-08 19:32:47 +00:00
vandwalle
5c3e062056 am a35a795f: Merge "add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don\'t loose connection, hence it must be looked at with each Network 
* commit 'a35a795fab56f3d0239a67191f97aa1756fecd3b':
  add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don't loose connection, hence it must be looked at with each Network State Change
 2014-09-08 19:32:44 +00:00
Tom O'Neill
9f8c80df1d Merge "Fix a STOPSHIP" into lmp-dev 2014-09-08 19:29:57 +00:00
vandwalle
171575266c Merge "add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don't loose connection, hence it must be looked at with each Network State Change" into lmp-dev 2014-09-08 19:22:15 +00:00
Andrew Lee
3085a6c739 Rename methods/variables on PhoneAccount for API cleanup. 
+ Rename from Handle to Address.
+ Rename from SubscriptionNumber to SubscriptionAddress.
+ Store the subscription address as a Uri.

Bug: 17390175
Bug: 17329632
Change-Id: I67514d89f0e7c81f74bef352df7a55cc422d1c71
 2014-09-08 12:00:05 -07:00
Kenny Guy
c2a4060005 Revert "Ensure ApplicationInfo is for correct user for system/android package." 
Cache in ActivityThread means this still doesn't make sure we will
get an ApplicationInfo for the user being requested. So reverting.

This reverts commit 4a3b8aa08d743b28d53b327597abf03a925641f2.

Bug:17002733
Change-Id: Ie40eb31c4074cea09de3d6a41fe38b14e00eb059
 2014-09-08 18:53:56 +00:00
Svet Ganov
a8ea00af2a am a00c7eb9: Merge "Clicking on partially coverd views by other views or windows." into lmp-dev 
* commit 'a00c7eb909b043ce5c915604087438d06b7d164e':
  Clicking on partially coverd views by other views or windows.
 2014-09-08 18:51:42 +00:00
Dharmesh Mokani
ca1459bb0f am e70ac872: Merge "Remove old methods : AlwaysOnHotwordDetector" into lmp-dev 
* commit 'e70ac872c6655c6ab8c0e3ce48a7ed13df99494f':
  Remove old methods : AlwaysOnHotwordDetector
 2014-09-08 18:51:39 +00:00
Svet Ganov
2bb02c799c Merge "Clicking on partially coverd views by other views or windows." into lmp-dev 2014-09-08 18:45:04 +00:00
Dharmesh Mokani
2b02f88737 Merge "Remove old methods : AlwaysOnHotwordDetector" into lmp-dev 2014-09-08 18:43:14 +00:00
Jason Monk
bc80f9d2f9 am 01ac9651: Merge "Update downtime to handle TimeZone change" into lmp-dev 
* commit '01ac96519ec69af24d053c9e790068e3c51f4f57':
  Update downtime to handle TimeZone change
 2014-09-08 18:40:14 +00:00
Craig Mautner
9ac2f6c8ec am 851f7eb5: Merge "Ignore finishing activities when fetching the top" into lmp-dev 
* commit '851f7eb59803dbc86ce36a95034249968a95d831':
  Ignore finishing activities when fetching the top
 2014-09-08 18:34:50 +00:00
George Mount
539909ae96 am f7b281a6: Merge "Use Alpha instead of TransitionAlpha for Activity Transitions." into lmp-dev 
* commit 'f7b281a624c76d0bb744cf4bb47e92d35b66e34b':
  Use Alpha instead of TransitionAlpha for Activity Transitions.
 2014-09-08 18:34:47 +00:00
Jason Monk
100d9471ab Merge "Update downtime to handle TimeZone change" into lmp-dev 2014-09-08 18:33:09 +00:00
Craig Mautner
d2a38c7854 Merge "Ignore finishing activities when fetching the top" into lmp-dev 2014-09-08 18:32:01 +00:00
George Mount
214e7ad175 Merge "Use Alpha instead of TransitionAlpha for Activity Transitions." into lmp-dev 2014-09-08 18:25:03 +00:00