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

205467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
8197e2de06 am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev 
* commit 'ffc6ce000568c08a50f7b538bd4cd7729e64c229':
  Fix asymmetry in parceling/unparceling code for BatteryStats summary
 2015-09-29 23:30:27 +00:00
Adam Lesinski
ffc6ce0005 Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev 2015-09-29 23:22:59 +00:00
Jianing Wei
2813b0fae9 Camera2: Update video stabilization API doc. 
Bug: 23353979
Change-Id: I781006d1b6ebbdf522ebbf6acc35b2062aff76b6
 2015-09-29 16:04:14 -07:00
Dmitry Torokhov
a43a96be9e Add ESC mapping for Pixel C keyboard 
Now that we have "replace" key event support in the framework we can map
ESC as AltR+1.

Bug: 24504154

Change-Id: Ief8a50098fc5484171011f268ffc22a309cbba62
 2015-09-29 13:31:18 -07:00
Dmitry Torokhov
4608f10849 Add layout and keymap for Pixel C Bluetooth keyboard 
This adds special layout and character map for Pixel C keyboard (Dragon
base) that lacks several keys, such as ESC, bracket keys, tilda and
backslash, which are mapped various Alt-R combinations.

Currently we map:

 [Shift]+AltR+2 -> ~ and `
 [Shift]+AltR+O -> { and [
 [Shift]+AltR+P -> } and ]
 [Shift]+AltR+= -> | and \

ESC mapping requires additional changes.

Bug: 24504154

Change-Id: I24fc68efe7e2ddebee26a273838443b441491857
 2015-09-29 13:30:59 -07:00
Jeff Sharkey
cc2ae6b421 Relax auto-launch checks for GET_CONTENT. 
When a developer wraps an intent with Intent.createChooser(), they're
indicating that the user should always be prompted, instead of using
any "always use" defaults.  A recent CL changed the chooser behavior
to ensure that UI is always shown in the case where there is only one
match.

However, this caused us to start prompting for the GET_CONTENT intent,
for which there is only ever one DocumentsUI system app.  Since that
app delivers on the createChooser() contract described above, we're
okay automatically launching it.

Bug: 24464358
Change-Id: I0279d3343479c134a35f41ddf3cb4204d0ae6a90
 2015-09-29 13:04:48 -07:00
Selim Cinek
01db67d9f7 Ambient display now comes up immediately when a notification comes in 
Previously there was always a 1s delay which could even become a 5-8s
delay if the Alarm was not delivered in time.

Bug: 24355754
Change-Id: I1625c69719eee81403a1fcce1358d4d6c9fcf3e9
 2015-09-29 11:59:29 -07:00
Bill Rassieur
2711eb4c39 am 3de2d53a: am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev 
* commit '3de2d53a75ed66ee3e64412adfb77ff5a729b43a':
  Fix jank: Don't write lockout deadline if not needed
 2015-09-28 23:15:24 +00:00
Bill Rassieur
3de2d53a75 am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev 
* commit 'c25d546050423845c42a5e8cc8e356caa1f4f71a':
  Fix jank: Don't write lockout deadline if not needed
 2015-09-28 23:09:10 +00:00
Bill Rassieur
c25d546050 Merge "Fix jank: Don't write lockout deadline if not needed" into mnc-dr-dev 2015-09-28 23:02:46 +00:00
Jorim Jaggi
e3e6d56b94 Fix jank: Don't write lockout deadline if not needed 
In the longterm, we should move these synchronous writes
off the main thread, but in the short term, avoiding an unnecessary
write is good enough for the main case.

Bug: 24471234
Change-Id: Id996ff29e61410cd077760a06d7868a413ae88da
 2015-09-28 13:57:37 -07:00
Adam Lesinski
a57a540440 Fix asymmetry in parceling/unparceling code for BatteryStats summary 
Bug:24434303
Change-Id: I638979e54076004860035396738f6a1281e26c20
 2015-09-28 10:59:45 -07:00
Billy Lau
81451c1c37 am cb4bafb4: am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev 
* commit 'cb4bafb4c97dc5e73b055ae1c0e4a548068062cd':
  Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
 2015-09-28 17:38:08 +00:00
Billy Lau
cb4bafb4c9 am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev 
* commit '86e153d5f0614c9f3da137fd0b815a398598928b':
  Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
 2015-09-28 17:31:48 +00:00
Billy Lau
86e153d5f0 am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev 
* commit 'f360bbca969f60ee968240d22bc0b1f1e5e17218':
  Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
 2015-09-28 17:24:25 +00:00
Billy Lau
f360bbca96 Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev 2015-09-28 17:18:30 +00:00
Jae Seo
6fb2da6506 Merge "docs: fix a wrong link" into mnc-ub-dev 2015-09-28 17:17:00 +00:00
Adam Lesinski
b8126531c4 am d913782f: am d5f10154: Bump BatteryStats version 
* commit 'd913782f1b48e1ef5928f869279c541e023d1cb7':
  Bump BatteryStats version
 2015-09-28 07:06:55 +00:00
Adam Lesinski
d913782f1b am d5f10154: Bump BatteryStats version 
* commit 'd5f10154c772b925f6527e25aeb8461de8c710cd':
  Bump BatteryStats version
 2015-09-28 07:00:52 +00:00
Baligh Uddin
ab46a9adf8 am a9abcc43: (-s ours) am edd35f92: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'a9abcc43ae71b907e6944ec0710834ef56801145':
  Import translations. DO NOT MERGE
 2015-09-27 22:37:45 +00:00
Baligh Uddin
4ecf83e99c am 4ac4ba5d: (-s ours) am 0307a2a6: (-s ours) Import translations. DO NOT MERGE 
* commit '4ac4ba5d1295b31a759609fd1e495cbf5e18ea64':
  Import translations. DO NOT MERGE
 2015-09-27 22:37:39 +00:00
Adam Lesinski
d5f10154c7 Bump BatteryStats version 
Bug:24434303
Change-Id: I697deb30c211c77c36cdd810259507f965f3b93b
 2015-09-27 21:28:43 +00:00
Baligh Uddin
a9abcc43ae am edd35f92: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'edd35f922c492bb23d266c54e9c69505d3539680':
  Import translations. DO NOT MERGE
 2015-09-27 20:55:44 +00:00
Baligh Uddin
4ac4ba5d12 am 0307a2a6: (-s ours) Import translations. DO NOT MERGE 
* commit '0307a2a68dd4afceb480d1d0fdc792690ad88df7':
  Import translations. DO NOT MERGE
 2015-09-27 20:55:40 +00:00
Baligh Uddin
edd35f922c Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-27 04:05:09 +00:00
Baligh Uddin
0307a2a68d Import translations. DO NOT MERGE 
Change-Id: Ibaf19bf407113bcedc96d367a80b3a7b1999f7c5
Auto-generated-cl: translation import
 2015-09-26 13:05:11 -07:00
Baligh Uddin
63d93ba58a Import translations. DO NOT MERGE 
Change-Id: I349825f72d9e929562abd599816a4ae428112ea6
Auto-generated-cl: translation import
 2015-09-26 12:34:51 -07:00
Bryce Lee
861559d31f am 24e5efda: Merge "Add additional broadcast for when a phone account is unregistered." into cw-e-dev 
* commit '24e5efda0509871d2a7a779739cce5264de68459':
  Add additional broadcast for when a phone account is unregistered.
 2015-09-26 02:48:18 +00:00
Bryce Lee
24e5efda05 Merge "Add additional broadcast for when a phone account is unregistered." into cw-e-dev 2015-09-26 02:41:50 +00:00
Bryce Lee
6ad696c35b am f0740e0a: Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev 
* commit 'f0740e0a2e51d2cb9b6e9ea7fbd251bfa9b2a0ad':
  Add ThermalObserver system service to capture thermal state uevents.
 2015-09-26 01:41:22 +00:00
Bryce Lee
f0740e0a2e Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev 2015-09-26 01:33:00 +00:00
Bryce Lee
bc58f59da6 Add ThermalObserver system service to capture thermal state uevents. 
Bug: 21445745
Change-Id: I980d60b66ca51942a1fd62502d6cf1f09208fc3a
 2015-09-25 16:43:01 -07:00
Adrian Roos
47a497cf53 am 1a6f9216: am 896b9c62: Merge "Show charging speed when time to full is available" into mnc-dr-dev 
* commit '1a6f9216f49f6392d33fc30cee7e1ccbca93c081':
  Show charging speed when time to full is available
 2015-09-25 23:36:15 +00:00
Adrian Roos
1a6f9216f4 am 896b9c62: Merge "Show charging speed when time to full is available" into mnc-dr-dev 
* commit '896b9c6261641e285bc37c4d22a589b01ce11ffe':
  Show charging speed when time to full is available
 2015-09-25 23:27:59 +00:00
Adrian Roos
896b9c6261 Merge "Show charging speed when time to full is available" into mnc-dr-dev 2015-09-25 23:23:26 +00:00
Adrian Roos
7e39e59f37 Show charging speed when time to full is available 
Only shows if translation is available, follow-up
I3e883eeca002e86d4df30c2b238e18bd63bbddea to show in
all locales.

Bug: 24167496
Change-Id: I667cde69e5d5f8aec8ac9fd105bbfb7e118ced64
 2015-09-25 15:22:32 -07:00
Nick Vaccaro
5eccf896a8 am faf3f370: Merge "Fix sensor usage model" into cw-e-dev 
* commit 'faf3f3706140c3b90c805e77c3c72c0978b0d61a':
  Fix sensor usage model
 2015-09-25 21:44:26 +00:00
Nick Vaccaro
faf3f37061 Merge "Fix sensor usage model" into cw-e-dev 2015-09-25 21:36:14 +00:00
Ned Burns
11b87b9109 am 1b69fcbf: am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed 
* commit '1b69fcbf810a805a0fa3dbfc6a3d7cc49d87f33e':
  Kill ActivityView's background thread when it's destroyed
 2015-09-25 21:20:08 +00:00
Ned Burns
1b69fcbf81 am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed 
* commit 'f4e1d10cd35a4c1f87ec6dc3e59a9d08e562ffca':
  Kill ActivityView's background thread when it's destroyed
 2015-09-25 21:10:09 +00:00
Nick Vaccaro
20feaea1aa Fix sensor usage model 
Changed to use the correct API based on the reporting type of the
chosen sensor.  The code was incorrectly treating the WRIST TILT
sensor as a one-shot sensor instead of a special-reporting sensor.

Bug: 11661021
Change-Id: Ib8b7ef5bad9642773f4c0e22e218fbec8c34439b
 2015-09-25 13:21:46 -07:00
Jae Seo
57551c2896 docs: fix a wrong link 
Change-Id: Ib60dfb5a4c9ac8138a357af492f55ca27a7466f6
 2015-09-25 12:50:08 -07:00
Jeff Sharkey
307d424467 Clean stale entries when deleting files. 
When deleting files directly from external storage devices, remove
any matching entries from MediaStore so we don't end up showing
stale entries to clients, such as MTP/PTP.

Also handles the case where an entire directory is deleted.

Bug: 24045921
Change-Id: I802470fa1aa03e0bec147ea113f1a49e26a0f3f9
 2015-09-25 10:30:07 -07:00
Gus Prevas
41110261bb am b17d1e5e: Merge "Adds an option to override RemoteViews transition." into cw-e-dev 
* commit 'b17d1e5e6aa53f5925efc2135b9a603a9a0ed2df':
  Adds an option to override RemoteViews transition.
 2015-09-25 17:24:39 +00:00
Gus Prevas
b17d1e5e6a Merge "Adds an option to override RemoteViews transition." into cw-e-dev 2015-09-25 17:17:44 +00:00
Ian Pedowitz
4c74a02eea am 3af6163a: am 31fe464d: Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev 
* commit '3af6163a66dceb7a6e6e300f5f8de828c88919d4':
  Give the DhcpClient alarm broadcasts foreground priority.
 2015-09-25 17:17:25 +00:00
Gus Prevas
1ed322b123 Adds an option to override RemoteViews transition. 
This change adds a configuration option,
"config_overrideRemoteViewsActivityTransition", which is false by
default and true on watches.  If it's true, when a RemoteViews
is clicked, it will use a new attribute on the active window animation
style, "activityOpenRemoteViewsEnterAnimation", to determine
the entry transition to use, instead of the current hard-coded
default.

Bug: 23534750
Change-Id: I91e92804a663ab71a3e46c3430fa579b87cc7931
 2015-09-25 13:10:52 -04:00
Ian Pedowitz
3af6163a66 am 31fe464d: Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev 
* commit '31fe464d50bcd4360ac004d44d6938eac762d78d':
  Give the DhcpClient alarm broadcasts foreground priority.
 2015-09-25 17:10:33 +00:00
Ian Pedowitz
31fe464d50 Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev 2015-09-25 17:04:14 +00:00
Joe LaPenna
5d05db2877 am ac342d38: (-s ours) Merge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into cw-e-dev 
* commit 'ac342d3831991060c1ccac26aaa764e0a9ae7e15':
  Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE
 2015-09-25 09:40:15 +00:00