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

136957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Langemak
e2f8183077 Merge "DO NOT MERGE: revert change preventing NULL SSID in a WifiConfiguration" into lmp-preview-dev 2014-05-28 00:48:19 +00:00
vandwalle
f4672ad2e4 DO NOT MERGE: revert change preventing NULL SSID in a WifiConfiguration 
bug: 15114340

Change-Id: Ic66363fc7781a1d65e5b8647843a752c048145a1
(cherry picked from commit 7aa05179b970e9f1346374f1e506a2cfeaff060a)
 2014-05-28 00:48:04 +00:00
Griff Hazen
d5f11f98d1 DO NOT MERGE Cherry-pick: Add full screen size preset to WearableExtender 
Bug: 14838838

Change-Id: Id038d994d61d3c89dba08232a424a5b1b934e5db
 2014-05-27 17:36:44 -07:00
Griff Hazen
14f5799ba9 DO NOT MERGE Cherry-pick: Doc fixes for Notification.WearableExtender 
Change-Id: I22947e30d329e667079555ac4ac5f9b25d6bd3fa
 2014-05-27 17:34:27 -07:00
Griff Hazen
24f1e5342e Merge "DO NOT MERGE Cherry-pick: Fix current.txt" into lmp-preview-dev 2014-05-28 00:32:01 +00:00
Griff Hazen
9ed2e4e465 Merge "DO NOT MERGE Cherry-pick: Fix build: CheckBuild line for removed wearable package" into lmp-preview-dev 2014-05-28 00:31:53 +00:00
Griff Hazen
e6fff6e088 Merge "DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications" into lmp-preview-dev 2014-05-28 00:31:46 +00:00
Jose Lima
80962666b8 Merge "Only allow 1 Stack on Leanback-only devices" into lmp-preview-dev 2014-05-28 00:10:15 +00:00
Chris Craik
ddce68996b Merge "Update docs around empty/null outline behavior" into lmp-preview-dev 2014-05-28 00:08:58 +00:00
Igor Murashkin
79458826c6 Merge "camera2: Add partial results to the capture listener (API change)" into lmp-preview-dev 2014-05-27 23:54:21 +00:00
Jose Lima
a5c7e0f80f Only allow 1 Stack on Leanback-only devices 
- For Leanback only devices we will force all activities to
   live in the same app stack. This is a design decision for the
   shy/gregarious changes we are planning to implement for
   leanback devices.

Change-Id: I201f56541ba22356e9598f09419ad41e588c74dc
 2014-05-27 16:51:35 -07:00
Adrian Roos
26690339e9 Merge "Add and improve logged TrustAgent connection events" into lmp-preview-dev 2014-05-27 23:46:50 +00:00
Jorim Jaggi
0d674623fa Add methods to coordinate unlock animation. 
Introduce IWindowManager.keyguardGoingAway to notify that Keyguard
wants to dismiss it self. This method starts the state machine in
WindowAnimator which animates in the activity behind the keyguard.
Animating out the keyguard is done by the StatusBar/Keyguard
software when it receives the startKeyguardExitAnimation() callback.

Bug: 14118756

Change-Id: Id3b8f41189410bad808b4892fbec74245e59efce
 2014-05-27 16:45:57 -07:00
Dave Langemak
dab839e047 Merge "Move dis/enable of mobile data to Telephony" into lmp-preview-dev 2014-05-27 21:26:52 +00:00
Chris Craik
67c360f3d5 Update docs around empty/null outline behavior 
bug:15257846
Change-Id: Ie4d1b0aaeb900eaaa7e54097f3e0d795beb8f445
 2014-05-27 14:10:17 -07:00
Jorim Jaggi
2d6f780cc5 Merge "Remove charging text and carrier label on bouncer." into lmp-preview-dev 2014-05-27 20:30:28 +00:00
Robert Greenwalt
afa05c0b43 Move dis/enable of mobile data to Telephony 
ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
(cherry picked from commit 53013c87496980b534e447e717a32698fbd4bca0)
 2014-05-27 20:28:50 +00:00
Ashish Sharma
6020071df9 Include START event (reboots) in partial history. 
Change-Id: Ia1e5fba6c2c7bdb3f09eb5958d7134564d60e8b0
 2014-05-27 20:27:59 +00:00
Jorim Jaggi
6ecbe3f2d6 Merge "Remove up pointing arrow in navbar." into lmp-preview-dev 2014-05-27 20:24:48 +00:00
Jorim Jaggi
7b0de297e1 Remove up pointing arrow in navbar. 
We don't need it anymore. Yay!

Bug: 15283575
Change-Id: Iac5543a733c047711e5c37f290758456116469a5
 2014-05-27 22:22:51 +02:00
Jorim Jaggi
40a0b38160 Remove charging text and carrier label on bouncer. 
But still show it for SIM PIN/PUK.

Bug: 15283575
Change-Id: Id343e5b2fb5c695f46cd23d8509109987fa2d290
 2014-05-27 22:20:37 +02:00
Jean-Michel Trivi
1ad0192800 DO NOT MERGE temporary hide of AudioAttributes 
Bug 15089989

Change-Id: I6077d4906d5624be4dd2b8a5c3378a04c848b6d8
 2014-05-27 12:44:05 -07:00
John Spurlock
3d09bbd04f Better wifi-enabled signal from network controller. 
The old "is wifi enabled" signal was geared toward the cluster
view.  Since the clients of the callbacks are now only QS tiles,
make sure to plumb through the actual enabled value all the way
up to the tile.

Bug:15161053
Change-Id: I8b69c599f06d5b36e3f44dc666e1621840ffd927
(cherry picked from commit fd0ea545d47b19c2ebff203a6e768a60698f3609)
 2014-05-27 19:34:10 +00:00
Winson Chung
8804ce96b1 Merge "Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)" into lmp-preview-dev 2014-05-27 19:28:51 +00:00
Chris Wren
2ed67e6de7 Merge "Reduce logspam by catching unexpected types ourselves." into lmp-preview-dev 2014-05-27 19:15:25 +00:00
Jorim Jaggi
fbd168331c Merge "Skeleton for Keyguard security method appear animations." into lmp-preview-dev 2014-05-27 18:31:57 +00:00
Jorim Jaggi
37d5c23998 Merge "Show bouncer immediately when MOTION_UP is received" into lmp-preview-dev 2014-05-27 18:31:10 +00:00
Igor Murashkin
db075afc85 camera2: Add partial results to the capture listener (API change) 
* Also adds capture sequence aborted callback

Bug: 12492876
Change-Id: I56ec8edbcda8b64c2262ff7472961ac78042c7f4
 2014-05-27 11:25:24 -07:00
Winson Chung
9693d95343 Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617) 
Change-Id: I371ee43296a983782eaed2e661b1febc71c86433
 2014-05-27 11:09:22 -07:00
Winson Chung
5859fc1096 Merge "DO NOT MERGE" into lmp-preview-dev 2014-05-27 18:04:36 +00:00
Adrian Roos
7d59b4f981 Add and improve logged TrustAgent connection events 
Adds events for when a TrustAgentService gets connected
or is stopped. Also explicitly revokes trust when a
trust agent gets disconnected, such that it shows up in
dumpsys.

Bug: 15281644
Change-Id: I5875a34da923345683279c1f755d43454ff6318d
 2014-05-27 20:01:45 +02:00
John Spurlock
150c07993f Merge "frameworks/base: Performance tweaks for SeekBarVolumizer." into lmp-preview-dev 2014-05-27 17:58:48 +00:00
John Spurlock
4bb35da6ce Merge "Remove airplane, bugreport, and ringer mode global actions." into lmp-preview-dev 2014-05-27 17:48:14 +00:00
Christoph Studer
d68200c66b Merge "NoMan: Disable SQLite log DO NOT MERGE" into lmp-preview-dev 2014-05-27 17:41:34 +00:00
Christoph Studer
e397521449 Merge "NoMan: Allow disabling SQLiteLog." into lmp-preview-dev 2014-05-27 17:41:03 +00:00
John Spurlock
17f3f16c4f Remove airplane, bugreport, and ringer mode global actions. 
Bug:15281315
Change-Id: I16aa759a3269bb7757350edf2330cd72fd99a023
 2014-05-27 13:32:04 -04:00
John Spurlock
95caba1270 frameworks/base: Performance tweaks for SeekBarVolumizer. 
Move ringtone init to the worker thread.  Allow the volumizer
instance to be reused by making the seekbar settable.

Bug:15091992
Change-Id: Ib616ae0fbb9a45c63391f8335e48ec2754dbdcd5
 2014-05-27 13:10:38 -04:00
Winson Chung
2eb4f9c377 DO NOT MERGE 
Removing unnecessary public values. (Bug 14995844)
(cherry picked from commit aa327fc2ce428f939885e1172578ff1dc975214c)

Change-Id: I98672d0ed3120c15bf31ce7a21ab604cfe66273d
 2014-05-27 17:07:52 +00:00
Winson Chung
8f4f2ff5cb Merge "DO NOT MERGE " into lmp-preview-dev 2014-05-27 17:07:10 +00:00
Craig Mautner
c752919c7c Merge "Do not start tasks on ActivityViews unless explicit. DO NOT MERGE" into lmp-preview-dev 2014-05-27 16:37:45 +00:00
Craig Mautner
b539b3aafb Do not start tasks on ActivityViews unless explicit. DO NOT MERGE 
New tasks were being started on ActivityViews because they
matched packages. This fix enforces a rule that new tasks
can only be started on ActivityViews if they are explicitly
targeted for that ActivityView.

Fixes bug 15162447.

Change-Id: I9ccb72171b5cda0897a0b9ffe4cbebfbb0d92c2c

Conflicts:
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
 2014-05-27 09:22:55 -07:00
Craig Mautner
5d0045835b Merge "Add more error checking to xml restore" into lmp-preview-dev 2014-05-27 16:13:28 +00:00
ztenghui
427a15a0f0 Merge "DO NOT MERGE: Hide the VectorDrawable" into lmp-preview-dev 2014-05-27 16:09:05 +00:00
Adrian Roos
a33ea18dc6 Merge "Initialize background visibility of ActivatableNotificationView" into lmp-preview-dev 2014-05-27 15:37:38 +00:00
John Spurlock
fc9e1e0592 Merge "DO NOT MERGE Hide vibrator streamHint overloads for preview." into lmp-preview-dev 2014-05-27 15:13:34 +00:00
Christoph Studer
711259a9e4 NoMan: Disable SQLite log DO NOT MERGE 
Bug: 15279504
Change-Id: I76f9283675537607729ed450471ef4b1d9ec3898
 2014-05-27 16:56:47 +02:00
Christoph Studer
05e2884972 NoMan: Allow disabling SQLiteLog. 
Bug: 15279504
Change-Id: I561391a312f88a7d5e11b180984f18bb1d3dcda0
 2014-05-27 16:55:57 +02:00
Adrian Roos
bcbb75ac9d Initialize background visibility of ActivatableNotificationView 
Initializes the background visibilities that were previously
only set when adding the view to the scroller,
resulting in HUNs having two backgrounds.

Bug: 15106201
Change-Id: I21ef3b34c6feb0e852c9dc2c3289665cff40927e
 2014-05-27 16:39:53 +02:00
Craig Mautner
b45a730efb Merge changes I88865c02,I34cc1310 into lmp-preview-dev 
* changes:
  Check for null DO NOT MERGE
  Improve DocCentric documentation. DO NOT MERGE
 2014-05-27 14:24:04 +00:00
Craig Mautner
8aa29921df Merge "Only start TaskPersister once." into lmp-preview-dev 2014-05-27 14:22:04 +00:00