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

7609 Commits

Author SHA1 Message Date
Maggie Benthall
96b82aae35 am b964e5ed: am f5aba5ad: Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev 
* commit 'b964e5edff92849c4ade7d43b86bfaca26d2a4a4':
  CA cert monitoring: add notifications and actions for dialog
 2013-09-14 11:04:08 -07:00
Maggie Benthall
b964e5edff am f5aba5ad: Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev 
* commit 'f5aba5ad1e09829a13bd0ad4912e45ff3d773176':
  CA cert monitoring: add notifications and actions for dialog
 2013-09-14 11:02:43 -07:00
Maggie Benthall
f5aba5ad1e Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev 2013-09-14 18:00:13 +00:00
Vineeta Srivastava
6a60c7bd4e am 2089abdf: am 45fa4219: Merge "Roaming Icon should not displayed with Indosat\'s old SIM" into klp-dev 
* commit '2089abdf787df5a179db6486f39441c57db82833':
  Roaming Icon should not displayed with Indosat's old SIM
 2013-09-13 17:30:33 -07:00
Vineeta Srivastava
2089abdf78 am 45fa4219: Merge "Roaming Icon should not displayed with Indosat\'s old SIM" into klp-dev 
* commit '45fa42195efc6f3d7ca531d405905963a4de6e0e':
  Roaming Icon should not displayed with Indosat's old SIM
 2013-09-13 17:15:55 -07:00
Sungmin Choi
fa4e1d417c Roaming Icon should not displayed with Indosat's old SIM 
Bug: 10403087
Change-Id: If2ea5650ed9a665da94f2941507fb273800b3ab8
 2013-09-13 15:30:09 -07:00
John Spurlock
19522aba8d am 0899d983: am 49580cf1: Merge "SystemUI status bar/quick settings updates." into klp-dev 
* commit '0899d983ffbbcf7b9bd9ff0eb83f11f5fe260e26':
  SystemUI status bar/quick settings updates.
 2013-09-13 13:27:13 -07:00
John Spurlock
0899d983ff am 49580cf1: Merge "SystemUI status bar/quick settings updates." into klp-dev 
* commit '49580cf1f768eb90a85f79f1cb7019d08d93332a':
  SystemUI status bar/quick settings updates.
 2013-09-13 13:20:01 -07:00
Maggie Benthall
0469f41010 CA cert monitoring: add notifications and actions for dialog 
In DevicePolicyManagementService, on boot and when certs are installed,
post notification to tell the user that their traffic may be
monitored.
Have QuickSettings use the MonitoringCertInfoActivity instead
of building the dialog itself.

Bug: 10633199

Change-Id: Ie4b97295a9fc25867c87872feccdb17f4bea071d
 2013-09-13 15:46:30 -04:00
John Spurlock
49580cf1f7 Merge "SystemUI status bar/quick settings updates." into klp-dev 2013-09-13 08:42:06 +00:00
Kenny Root
bd51158d61 resolved conflicts for merge of aca95ca0 to master 
Change-Id: I91adf923288ca724a8040ecf887e28e42ad7e259
 2013-09-12 21:49:35 -07:00
Wink Saville
afc79c4eab am d8fcc795: am 5fbfb81d: Merge "Define config_volte_replacement_rat." into klp-dev 
* commit 'd8fcc7951f02e3c66f549937a2b1458a4352d174':
  Define config_volte_replacement_rat.
 2013-09-12 21:42:15 -07:00
Alan Viverette
aca95ca0e3 am 2a65a283: Merge "Add live region politeness to View, AccessibilityNodeInfo" into klp-dev 
* commit '2a65a2839e9b3e59a72348ee088f86cda7df604a':
  Add live region politeness to View, AccessibilityNodeInfo
 2013-09-12 21:37:50 -07:00
Wink Saville
d8fcc7951f am 5fbfb81d: Merge "Define config_volte_replacement_rat." into klp-dev 
* commit '5fbfb81d31d452f75bc088d380711642993fef1c':
  Define config_volte_replacement_rat.
 2013-09-12 21:37:08 -07:00
John Spurlock
2062abfa13 SystemUI status bar/quick settings updates. 
Status bar:
 - Update remaining mute/speakerphone icons.
 - Remove orange versions of wifi/signal icons.
 - Use only full versions of data type overlays.
 - Remove obsolete light versions of data type overlays.
 - Low battery color back to red.

Quick settings:
 - Update to indicate problem (orange) status.
 - Update to new battery style.

And a few remaining xx assets.

Bug:10680149
Bug:10502089
Bug:10729729
Bug:10316062
Change-Id: Iccd936d90271e4ec5c48e688917225136e7d45aa
 2013-09-13 02:18:14 +00:00
Alan Viverette
77e9a28e2f Add live region politeness to View, AccessibilityNodeInfo 
Alters the content change API to contain a bit mask of types of
changes represented by the event. Live regions send CONTENT_CHANGED
events immediately. Removes unused APIs for EXPANDABLE/EXPANDED.

BUG: 10527284
Change-Id: I21523e85e47df23706976dc0a8bf615f83072c04
 2013-09-12 17:16:09 -07:00
Wink Saville
5fbfb81d31 Merge "Define config_volte_replacement_rat." into klp-dev 2013-09-12 23:49:50 +00:00
Jeff Brown
67bd48fc3f am 9def46c9: am 09652ac1: Merge "Allow phone to enter suspend with positive proximity." into klp-dev 
* commit '9def46c9763c4e32690c15085e04985d29a7d485':
  Allow phone to enter suspend with positive proximity.
 2013-09-12 16:45:21 -07:00
Jeff Brown
9def46c976 am 09652ac1: Merge "Allow phone to enter suspend with positive proximity." into klp-dev 
* commit '09652ac1db59b70de47ff5ea49953773312a171f':
  Allow phone to enter suspend with positive proximity.
 2013-09-12 15:18:25 -07:00
Jeff Brown
09652ac1db Merge "Allow phone to enter suspend with positive proximity." into klp-dev 2013-09-12 22:15:38 +00:00
Jeff Brown
ec0832133a Allow phone to enter suspend with positive proximity. 
As part of the power manager rewrite in JB MR1, we removed the ability
for the phone to suspend with positive proximity because it was not
clear that the proximity sensor was always correctly registered as
a wake-up source.  The sensor service itself does not contain any
code to manage wake-ups.  Therefore proximity sensor based wake-up
relies on the sensor driver acquiring a timed wake lock when the
sensor reports a negative result.  This behavior is not very well
defined in the sensor HAL so there is a chance that it will not
work reliably on all devices.

This change adds a new config.xml resource to specify whether the
device should be allowed to suspend when the screen is off due to
positive proximity.  Devices that support this feature should set
the "config_suspendWhenScreenOffDueToProximity" resource to "true" in
their resource overlays.  The feature is disabled by default.

Bug: 9760828
Change-Id: Ic65ab7df0357271b133e2e44f5e35e7756e1e9e0
 2013-09-12 14:37:21 -07:00
Chet Haase
a9265c1083 am 913c0233: am c0f65209: Merge "Add exclude() methods to Transition" into klp-dev 
* commit '913c023387c319f6c7b1e4878a4d0d07f8624f78':
  Add exclude() methods to Transition
 2013-09-12 11:11:07 -07:00
Chet Haase
913c023387 am c0f65209: Merge "Add exclude() methods to Transition" into klp-dev 
* commit 'c0f652093ec9dffad23477402ab1cc0a5e415931':
  Add exclude() methods to Transition
 2013-09-12 11:09:26 -07:00
Chet Haase
c0f652093e Merge "Add exclude() methods to Transition" into klp-dev 2013-09-12 18:07:40 +00:00
Daniel Sandler
c77a18beca am 22dbb77b: am f3da15bd: Merge "Remove spurious density-specific default wallpaper." into klp-dev 
* commit '22dbb77b194536191770a64b4fd7d8df7feb9167':
  Remove spurious density-specific default wallpaper.
 2013-09-12 10:41:54 -07:00
Daniel Sandler
22dbb77b19 am f3da15bd: Merge "Remove spurious density-specific default wallpaper." into klp-dev 
* commit 'f3da15bde723e6f27ae6b64e8f0765e98b02e45d':
  Remove spurious density-specific default wallpaper.
 2013-09-12 10:38:37 -07:00
Daniel Sandler
f3da15bde7 Merge "Remove spurious density-specific default wallpaper." into klp-dev 2013-09-12 17:35:53 +00:00
Wink Saville
99e7847b76 Define config_volte_replacement_rat. 
Default value is 0 which means there is no replacement and
PhoneProxy#phoneObjectUpdater will not replace a VoLTE RAT.

Bug: 10673760
Change-Id: Ic77411b5da415c620fce5a185ca1d7542dfe3b7f
 2013-09-12 09:48:55 -07:00
Daniel Sandler
0594b192cd Remove spurious density-specific default wallpaper. 
Bug: 10671611
Change-Id: I719bfb09cfd1cbc56f577cdcbf0a9945739355e2
 2013-09-12 01:18:55 -04:00
Baligh Uddin
1d6c7990ba Merge "Import translations. DO NOT MERGE" 2013-09-12 02:45:24 +00:00
Baligh Uddin
0792054f6b Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:45:12 +00:00
Selim Gurun
dde1f8b01b am 1e763fd2: am e4fdc847: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 
* commit '1e763fd280b3dc555e6a0a3a6458fbdb9a43e096':
  Revert "Add permissions for the InCallUI Split."
 2013-09-11 18:08:56 -07:00
Selim Gurun
1e763fd280 am e4fdc847: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 
* commit 'e4fdc84794923f9408fc400ed9177178329a08cd':
  Revert "Add permissions for the InCallUI Split."
 2013-09-11 18:05:59 -07:00
Selim Gurun
e4fdc84794 Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 2013-09-12 01:02:45 +00:00
Selim Gurun
41b9ef9c4e Revert "Add permissions for the InCallUI Split." 
This reverts commit 4f7ffa90d117e499786c77bccefdef88c1714668.

Change-Id: If07f7dd0b416c070398593e2d5a15b3557c1f323
 2013-09-12 00:57:34 +00:00
Eric Laurent
835b5f344b am e33b79ef: am 95a18139: Merge "Add HOTWORD as an AudioSource" into klp-dev 
* commit 'e33b79ef373fd3db9de035b5ecf2137a0684a441':
  Add HOTWORD as an AudioSource
 2013-09-11 17:25:05 -07:00
Amith Yamasani
05a1278ea4 am 2861921c: am bdd06c0a: Merge "Change selection highlight for intent disambig dialog" into klp-dev 
* commit '2861921c2433867679bd7bd1bb674239eb0afa50':
  Change selection highlight for intent disambig dialog
 2013-09-11 17:24:39 -07:00
Adam Powell
a395e70109 am 18149fcf: am 6847447d: Merge "Action bar refactoring and transitions" into klp-dev 
* commit '18149fcf86eee3335b28b2c2373b585c4e18745a':
  Action bar refactoring and transitions
 2013-09-11 17:23:37 -07:00
Santos Cordon
e7f6bfbc51 am 07d545e0: am e0b7e4cf: Merge "Add permissions for the InCallUI Split." into klp-dev 
* commit '07d545e08d615865860a0f73b7eabfd149754893':
  Add permissions for the InCallUI Split.
 2013-09-11 17:23:04 -07:00
Alexander Ray
4c980cc6ae am b0049151: am 7563d423: Merge "Add consumer IR framework" into klp-dev 
* commit 'b0049151f7c1f2ffa7481ac7c6f6baf7a548c5e8':
  Add consumer IR framework
 2013-09-11 17:23:01 -07:00
Sandeep Siddhartha
6f64688bc8 am 6c5e9fb4: am f702286c: Merge "Remove HotwordRecognition APIs" into klp-dev 
* commit '6c5e9fb4c4215f76a8a1fd8d72eee1154deb1039':
  Remove HotwordRecognition APIs
 2013-09-11 17:22:55 -07:00
Eric Laurent
e33b79ef37 am 95a18139: Merge "Add HOTWORD as an AudioSource" into klp-dev 
* commit '95a181397dad3113b96e3cc7392a5b0f5d742f39':
  Add HOTWORD as an AudioSource
 2013-09-11 17:17:50 -07:00
Eric Laurent
95a181397d Merge "Add HOTWORD as an AudioSource" into klp-dev 2013-09-12 00:15:31 +00:00
Amith Yamasani
2861921c24 am bdd06c0a: Merge "Change selection highlight for intent disambig dialog" into klp-dev 
* commit 'bdd06c0a13a7d4c55d6b250ebbe8eeb9d1288b7c':
  Change selection highlight for intent disambig dialog
 2013-09-11 16:58:43 -07:00
Amith Yamasani
bdd06c0a13 Merge "Change selection highlight for intent disambig dialog" into klp-dev 2013-09-11 23:56:44 +00:00
Chet Haase
ff58f92a0a Add exclude() methods to Transition 
It would be useful for a transition to declare not just which
targets it wants to be run on, but also which targets it wants
to avoid. For example, you may not want to animate the items of
a ListView, or some other specific target in the view hierarchy.

This change adds various exclude*() methods which make it
possible to alter a transition to automatically ignore specific
views, ids, or classes in the hierarchy.

Issue #10692794 Transitions: Need API for excluding targets

Change-Id: If38025cdbee537a545e5a4268cbbd763af4622c5
 2013-09-11 13:53:43 -07:00
Adam Powell
18149fcf86 am 6847447d: Merge "Action bar refactoring and transitions" into klp-dev 
* commit '6847447da0b3e2e30e88838ec85244d1a0ee8927':
  Action bar refactoring and transitions
 2013-09-11 13:42:28 -07:00
Adam Powell
6847447da0 Merge "Action bar refactoring and transitions" into klp-dev 2013-09-11 20:38:41 +00:00
Amith Yamasani
ab7cbcef49 Change selection highlight for intent disambig dialog 
Use standard selection/activation highlights

Bug: 10529505
Change-Id: I81bc0a1a799f93dd6595d38c1a42d6d316e0d61a
 2013-09-11 13:06:23 -07:00
Santos Cordon
07d545e08d am e0b7e4cf: Merge "Add permissions for the InCallUI Split." into klp-dev 
* commit 'e0b7e4cf455b21316661b158edee12ac5467995c':
  Add permissions for the InCallUI Split.
 2013-09-11 12:10:13 -07:00