Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,750 Commits 3 Branches 0 Tags
d98e7c1df774eb86a67310f5cbc0dbdd91f33c19
Commit Graph

164750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
25c3421c5e Zen: Update condition text for current condition. 
If the provider sends us an updated summary (or other text)
for the currently selected exit condition, update the UI and
persisted condition.

Update the downtime condition text (end time/line2 + summary)
when the next alarm changes (if downtime = none).

Also, clear the fired-alarm cache on time or time-zone resets.

Bug: 16373455
Change-Id: Ib38c52104a281fcc04a89612b643a219fd82b40b
 2014-11-13 11:03:10 -05:00
Adrian Roos
2acaeda423 Fix Bitmap leaks in ImageWallpaper 
Bug: 18350603
Change-Id: I42ec057cd287955dcf3c382c237806fd9d6666a7
 2014-11-13 15:46:17 +00:00
Alexandra Gherghina
7f39e29504 am c61cabe5: Merge "Update current.txt with the new extra" into lmp-mr1-dev 
* commit 'c61cabe5b3e22c8ebbb0ef91a33c63904ecb9873':
  Update current.txt with the new extra
 2014-11-13 15:36:42 +00:00
Alexandra Gherghina
c61cabe5b3 Merge "Update current.txt with the new extra" into lmp-mr1-dev 2014-11-13 15:31:11 +00:00
Ignacio Solla
f3bd15cf80 am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev 
* commit 'bf79cbaba915dbbf419e5f59ca1ab258f64c88b4':
  [WebView] Allow the WebView to be compiled against the system SDK.
 2014-11-13 15:13:06 +00:00
Alexandra Gherghina
fca2575bff am 6e33f0fb: Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev 
* commit '6e33f0fbb57a8afc2184bd9a1798db8bd29e680a':
  Add extra for account migration in the DevicePolicyMamager
 2014-11-13 15:08:01 +00:00
Geoff Mendal
9bcd95ee7f am f030e66f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'f030e66f9d8b931bf58cb36ae3a0e72c9a487d96':
  Import translations. DO NOT MERGE
 2014-11-13 15:07:56 +00:00
Narayan Kamath
856a0d06a6 am eed1fba6: Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev 
* commit 'eed1fba6b54b3305af811b4dd9e367eab01a241b':
  Add detailed javadoc for AssetManager.getLocales.
 2014-11-13 15:07:51 +00:00
Jeff Brown
4d9bd1516f am fef1e0e7: Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev 
* commit 'fef1e0e7f0a6a8d3564031ca4ecf14ab070468ff':
  Make Message.setAsynchronous() public.
 2014-11-13 15:07:46 +00:00
Ignacio Solla
bf79cbaba9 Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev 2014-11-13 15:03:45 +00:00
Alexandra Gherghina
a73766790a Update current.txt with the new extra 
Bug: 17716971
Change-Id: Ice82394c681665aff96724faa2e8056656d2b1ab
 2014-11-13 14:43:03 +00:00
Alexandra Gherghina
6e33f0fbb5 Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev 2014-11-13 13:59:35 +00:00
Alexandra Gherghina
aaf2f3e895 Add extra for account migration in the DevicePolicyMamager 
This is in preparation for the implementation CL

Bug: 17716971
Change-Id: I3042b0781f48f3d9e84bfff899507b4b5ca156eb
 2014-11-13 12:46:16 +00:00
Geoff Mendal
2ebf761ebe Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-13 09:51:10 +00:00
Geoff Mendal
f030e66f9d Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-13 09:43:51 +00:00
Geoff Mendal
4cc7bbc9fd Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-13 09:41:29 +00:00
Narayan Kamath
eed1fba6b5 Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev 2014-11-13 09:33:12 +00:00
Geoff Mendal
9976cdbfa3 Import translations. DO NOT MERGE 
Change-Id: I2427bb3c070b9d0d69a2488970a3e74260800190
Auto-generated-cl: translation import
 2014-11-12 23:24:32 -08:00
Geoff Mendal
0df377c7a6 Import translations. DO NOT MERGE 
Change-Id: Ib3433ab22465ba880832eb10196bbab2472a7884
Auto-generated-cl: translation import
 2014-11-12 23:20:52 -08:00
Jeff Brown
fef1e0e7f0 Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev 2014-11-13 07:11:37 +00:00
Jeff Brown
24c1d664c4 Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev 2014-11-13 07:04:54 +00:00
Jeff Brown
a191aa99ab Remove an unnecessary condition from previous change. 
Change-Id: Ib966fbb373294ad60caf7f1d9cbb7fafd05ded6b
 2014-11-12 23:01:12 -08:00
Jeff Brown
1cbff0e310 Merge "Improve screen brightness boost behavior." into lmp-sprout-dev 2014-11-13 06:58:03 +00:00
Geoff Mendal
f26e4ce8b2 Import translations. DO NOT MERGE 
Change-Id: I2b1c0b5c7530c8733d15551bb11211fa3e5585df
Auto-generated-cl: translation import
 2014-11-12 21:07:02 -08:00
Renato Mangini
ee291ca2ce am 6f41522d: am c9fc837f: Add new samples to what\'s new page. 
* commit '6f41522d6847afa5bb7ce1cff2a64ec7e9f18ecf':
  Add new samples to what's new page.
 2014-11-13 04:05:00 +00:00
Renato Mangini
6f41522d68 am c9fc837f: Add new samples to what\'s new page. 
* commit 'c9fc837fb3d866484a8ed3e61f2ba551f76af66b':
  Add new samples to what's new page.
 2014-11-13 03:54:11 +00:00
Renato Mangini
c9fc837fb3 Add new samples to what's new page. 
Also reverted the order on the page to show most recent samples first.

Bug: 18323953
Change-Id: I79b01fa71547f4a7d843f52bdd1853dd8fbe54a8
 2014-11-12 18:55:06 -08:00
Jeff Brown
7b5be5e2a7 Improve screen brightness boost behavior. 
Wake-up when entering brightness boost mode, don't boost in ambient
mode since some display device drivers do strange things in that mode and
boost doesn't work.  Waking up feels more natural as well.

Don't flutter the power HAL's interactive mode bit simply due to changes
in display ready state since that may result in visible artifacts
such as display flashes.

Don't stop the auto-brightness sensor while temporarily boosted.

Don't prevent the display from entering the ready state while in brightness
boost since that would unnecessarily delay the transition from DOZING to AWAKE
until boost is finished.

Restart the user activity timeout when brightness boost ends and prevent
the display from dimming while boosted.

The pixel fairies basked in the sunlight.

Bug: 18262044
Bug: 18261782
Change-Id: I8c42a1e6091b0fe1253e90265ac248087ebc24e1
 2014-11-12 18:49:36 -08:00
Sarah Maddox
f378f7ff18 docs: Clarifies the difference between the Android framework location APIs 
and the Google Play services location APIs.
Fixes 80-character line length.

Bug: 18080006
Change-Id: I463e0bfe47e9113af2ce4e03806d25e082a9b285
 2014-11-13 13:41:05 +11:00
Andrew Lee
49b03c2374 am 990bbbb3: Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev 
* commit '990bbbb3521b44e23087c15f12d4f17ca14630af':
  Add telephony.DisconnectCause for merged IMS call.
 2014-11-13 02:18:38 +00:00
Andrew Lee
990bbbb352 Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev 2014-11-13 02:15:15 +00:00
Yorke Lee
be5ead83df am 5e783896: Merge "Fix PhoneAccount parceling (1/2)" into lmp-mr1-dev 
* commit '5e783896a20aeef2cf253331b7db245eade04b64':
  Fix PhoneAccount parceling (1/2)
 2014-11-13 00:55:42 +00:00
Yorke Lee
5e783896a2 Merge "Fix PhoneAccount parceling (1/2)" into lmp-mr1-dev 2014-11-13 00:50:02 +00:00
xinhe
f6eb33fd07 am 031d8fea: Merge "Update enabe/disableCellBroadcast with RAN argument" into lmp-mr1-dev 
* commit '031d8feaa96c2d47122ba352d282d0f762aac023':
  Update enabe/disableCellBroadcast with RAN argument
 2014-11-13 00:42:44 +00:00
xinhe
031d8feaa9 Merge "Update enabe/disableCellBroadcast with RAN argument" into lmp-mr1-dev 2014-11-13 00:38:00 +00:00
Adam Lesinski
648f810647 am db3d76ab: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev 
* commit 'db3d76ab685955aae4a3e363238a2931d89c6f03':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2014-11-13 00:35:58 +00:00
Adam Lesinski
db3d76ab68 Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev 2014-11-13 00:33:00 +00:00
Chris Craik
0e12fa12cb Add offset method to Outline 
Also clean up offset docs in Path

Change-Id: Ieca02611d32acce726efba652ae1969340a55a76
 2014-11-12 16:17:33 -08:00
Chris Craik
9750c6961c am 075b2b4f: Merge "Add details and performance warnings to save flag docs" into lmp-mr1-dev 
* commit '075b2b4ff9a9a96462a3102b54fdcabc6e5daf99':
  Add details and performance warnings to save flag docs
 2014-11-13 00:11:55 +00:00
Dianne Hackborn
e91ab7f080 am 377d80ba: Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev 
* commit '377d80ba53d4eda31d131f4f2bd899668cad426b':
  Put native apps above browser in resolver activity.
 2014-11-13 00:07:25 +00:00
Chris Craik
075b2b4ff9 Merge "Add details and performance warnings to save flag docs" into lmp-mr1-dev 2014-11-13 00:05:59 +00:00
Dianne Hackborn
377d80ba53 Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev 2014-11-13 00:03:53 +00:00
xinhe
c93802b993 Update enabe/disableCellBroadcast with RAN argument 
Allow them to take an explicit argument indicating GSM or CDMA range and
fix the extreme alert disable error.

Bug: 18202935
Change-Id: Ibf12be65c60807834705e7cc9e94ec485ce6b60a
 2014-11-12 15:58:16 -08:00
Renato Mangini
8d6699cc97 am 19865ccd: am 5d7f91c7: am 40ac90e9: am 1b657d92: Fix the order of sample categories left nav. 
* commit '19865ccd44958b0902b9eedd11df279a03ff74c1':
  Fix the order of sample categories left nav.
 2014-11-12 23:53:17 +00:00
Andrew Lee
840162d2b4 Add telephony.DisconnectCause for merged IMS call. 
When merged, IMS calls are consolidated into one call. Thus they
"disconnect", even though the user can continue to comminucate
with the party on that call.

We want to recognize this scenario so we can control relevant
behaviors (ie.don't play the "end call" tone in this case).

Bug: 18291234
Change-Id: I93247f88ed74467470504bec88fcfb7ed714f0ff
 2014-11-12 15:52:32 -08:00
Zoltan Szatmary-Ban
201caf57f9 Adding method to query backup manager service activity status 
Bug: 17367491
Change-Id: I9920c07d56c4c0ccb1f3dce637c0fb390902d2ff
 2014-11-12 23:51:31 +00:00
Renato Mangini
19865ccd44 am 5d7f91c7: am 40ac90e9: am 1b657d92: Fix the order of sample categories left nav. 
* commit '5d7f91c77605a5c444eaaae2b812280c57ca244c':
  Fix the order of sample categories left nav.
 2014-11-12 23:47:14 +00:00
Geoff Mendal
f625095204 am 57f06e94: (-s ours) am 2d28d697: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '57f06e94eb10bfb4edcfe452eb683a920d19ec77':
  Import translations. DO NOT MERGE
 2014-11-12 23:46:00 +00:00
Geoff Mendal
57f06e94eb am 2d28d697: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '2d28d697f6235c497237a11abb973b9109999e38':
  Import translations. DO NOT MERGE
 2014-11-12 23:41:57 +00:00
Renato Mangini
5d7f91c776 am 40ac90e9: am 1b657d92: Fix the order of sample categories left nav. 
* commit '40ac90e99da90956f26cf7f7bb4c205e28bbbc66':
  Fix the order of sample categories left nav.
 2014-11-12 23:39:11 +00:00