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

169953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
f93c82ae36 am f90404ca: (-s ours) am ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'f90404ca7b47234437b3f8f418fca313825de02c':
  Import translations. DO NOT MERGE
 2014-12-01 19:50:17 +00:00
Joe Fernandez
2cbfc8455d am 353da3f9: am 88e04fcb: am e9a816c5: am 1f5acf84: docs: December 2014 Dashboard update 
* commit '353da3f98d86eb750b756335892c768f76cc4616':
  docs: December 2014 Dashboard update
 2014-12-01 19:50:12 +00:00
smain@google.com
e979e259d2 am 77e889ed: am 446bab79: am 7512a46e: am fdff66ee: change Trulia context image 
* commit '77e889ed84ea0f626a9164fad50299d131a1cac1':
  change Trulia context image
 2014-12-01 19:50:07 +00:00
Shishir Agrawal
0201a6f6f1 TelephonyManager.setLine1NumberForDisplay should return a boolean. 
The call can fail and should return the success status of the call.

Bug: 18571337
Change-Id: I5f4a0bd65c807a018d2f2df9e39cf9125252257f
 2014-12-01 11:48:53 -08:00
Jason Monk
0f514474b2 am c0c34b42: am 03d705ab: Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev 
* commit 'c0c34b428f6d3de635bc832bbebdb7b9cb500ccd':
  SysUI: QS Wifi get connected wifi rssi from NC
 2014-12-01 19:48:42 +00:00
Amith Yamasani
e434a94936 am 0c81034c: am 731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev 
* commit '0c81034cac4efe7d538ff303cc9f2badbb22b8d8':
  Fix parsing bug that affects reading back guest restrictions
 2014-12-01 19:48:36 +00:00
Geoff Mendal
2a36f7e3ab am e7f81f3b: (-s ours) am 6ca3ba73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'e7f81f3b684bde04432889943c5085ed1d2b9b1b':
  Import translations. DO NOT MERGE
 2014-12-01 19:48:20 +00:00
John Spurlock
34c9ee1af8 am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev 
* commit '23a99a3ab09d90e3613b44a0962de7ed0028d620':
  Volume: Improve inline volume controls used in settings.
 2014-12-01 19:47:58 +00:00
Ihab Awad
984f3c4df8 am 8199d6c3: am 6cacf44e: Merge "Telecom API updates (1/6)" into lmp-mr1-dev 
* commit '8199d6c3db16d786f15f1d643afe599dcfa6cf1e':
  Telecom API updates (1/6)
 2014-12-01 19:47:23 +00:00
Chet Haase
fd942b50f1 am 8394e9ff: am 21871444: Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev 
* commit '8394e9fff32c8935e021f0e4e84c5c1de913b96f':
  Zero duration animations snap to end value when started
 2014-12-01 19:47:15 +00:00
Geoff Mendal
31457ead0f am 9e863741: (-s ours) am 3fbf3b93: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '9e8637411a2a637e5795ff721ea6a92141cf76ec':
  Import translations. DO NOT MERGE
 2014-12-01 19:47:03 +00:00
Geoff Mendal
835e719101 am 11fe2dfd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '11fe2dfd3267c86c598dd443aaf471e8d490b4bb':
  Import translations. DO NOT MERGE
 2014-12-01 19:46:57 +00:00
John Spurlock
f1832e2444 am 64e034e3: am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev 
* commit '64e034e351ad73b9cb99cb04511d0fea137c7a3b':
  Zen: Improve zen mode panel condition selection.
 2014-12-01 19:46:50 +00:00
John Spurlock
53da315f1d am c1e4d155: am 1a3af711: Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev 
* commit 'c1e4d1554f23db7f0de91a212d94a1b624dec64d':
  Doze: Break out proxcheck stats by pulse reason.
 2014-12-01 19:46:44 +00:00
John Spurlock
edd0d0ea98 am fdc07dce: am 26a695d9: Merge "Volume: Update remote volume icons." into lmp-mr1-dev 
* commit 'fdc07dce372e94b274b725ba571c2ad4979565da':
  Volume: Update remote volume icons.
 2014-12-01 19:46:38 +00:00
Geoff Mendal
fe021d5ee6 am 68137588: (-s ours) am 9cde3e1d: (-s ours) Import translations. DO NOT MERGE 
* commit '68137588d1a1924703a2b995b15293515c4ff418':
  Import translations. DO NOT MERGE
 2014-12-01 19:46:31 +00:00
Geoff Mendal
fceec9cad4 am a990faec: (-s ours) Import translations. DO NOT MERGE 
* commit 'a990faec871f4ca369e17c7bd36488747e890bc9':
  Import translations. DO NOT MERGE
 2014-12-01 19:46:24 +00:00
Wally Yau
4b187a2810 am 5b4e2e02: am da392904: Set stream volume to max when userMasterVolume is set to true. 
* commit '5b4e2e02744c676f2d282388c0d901494fe8a5b9':
  Set stream volume to max when userMasterVolume is set to true.
 2014-12-01 19:46:11 +00:00
Elliott Hughes
421f826a09 am 7ff0b469: am 07b4a291: am 3e2848d2: am 8fc88562: am 85e21bd5: Mention ProGuard in the JNI documentation. 
* commit '7ff0b469950c225ab3a8a245b6c5ff49ba38497e':
  Mention ProGuard in the JNI documentation.
 2014-12-01 19:45:32 +00:00
Geoff Mendal
f90404ca7b am ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'ff26f10fab3e79d535001b8e1c9155d7844375c4':
  Import translations. DO NOT MERGE
 2014-12-01 19:44:10 +00:00
Joe Fernandez
353da3f98d am 88e04fcb: am e9a816c5: am 1f5acf84: docs: December 2014 Dashboard update 
* commit '88e04fcbc679ae85043d5db4f7f17bbb7fc3f2d3':
  docs: December 2014 Dashboard update
 2014-12-01 19:44:04 +00:00
smain@google.com
77e889ed84 am 446bab79: am 7512a46e: am fdff66ee: change Trulia context image 
* commit '446bab79564e50c497e6ce5cf75a30ddd94855fe':
  change Trulia context image
 2014-12-01 19:43:58 +00:00
Jeremy Joslin
33783a962f am 500f7811: Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev 
* commit '500f781110dee5aad53410e9ef9b4003123c6981':
  Fix the ordering of extra values in the PI.
 2014-12-01 19:42:24 +00:00
Jeremy Joslin
500f781110 Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev 2014-12-01 19:36:04 +00:00
Adrian Roos
588d8e46df am 17e0a7e7: am 09eeab7c: Merge "Fix projection permission dialog layering" into lmp-mr1-dev 
* commit '17e0a7e7ac289deacff01c84591dae4009f86415':
  Fix projection permission dialog layering
 2014-12-01 19:33:21 +00:00
Geoff Mendal
bcfc525406 am de3f61f4: (-s ours) am 7028dec6: (-s ours) am 022f4277: (-s ours) Import translations. DO NOT MERGE 
* commit 'de3f61f46616ed42c03fc8f171324e011ddbcc5d':
  Import translations. DO NOT MERGE
 2014-12-01 19:32:36 +00:00
Scott Main
46f0ffa99b am cd79f9f0: am 4a45a441: am 2995bd80: am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs 
* commit 'cd79f9f0f4a3fb3527023450839313aa67e5e106':
  docs:advmgr-updates
 2014-12-01 19:32:31 +00:00
smain@google.com
183d9e4a75 am b8de593e: am 576e248f: am 277fb8fd: am d3c17270: am 3a4b011c: define height for context images to avoid content jumps on load 
* commit 'b8de593ec2ca04009835960357c59feff28af551':
  define height for context images to avoid content jumps on load
 2014-12-01 19:32:25 +00:00
Narayan Kamath
53651b9982 am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev 
* commit 'ff45e7df8aae0f55ce719de92102c7d522b62048':
  Be increasingly aggressive about fstrim if it isn't being run
 2014-12-01 19:32:12 +00:00
Amit Mahajan
719638afea am b957d11a: am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev 
* commit 'b957d11a5375e05b4e6c06c4c8d472d3c472caf7':
  Change to use DATA_ROAMING setting correctly with subId.
 2014-12-01 19:32:06 +00:00
Alan Viverette
53644fb5ac am 015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev 
* commit '015b9e56d4ad528dd406672ef6264c85e41a20fd':
  Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
 2014-12-01 19:17:30 +00:00
Stuart Scott
7151cde3ca Subscription Info density-dependent text size and localized SIM slot index 
Change-Id: I49fed470ea82c91ff7d77df2c3447b17a203a38d
 2014-12-01 11:14:53 -08:00
Alan Viverette
015b9e56d4 Merge "Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked" into lmp-mr1-dev 2014-12-01 19:12:49 +00:00
Geoff Mendal
ff26f10fab Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-12-01 19:11:04 +00:00
Geoff Mendal
5ba33370d8 Import translations. DO NOT MERGE 
Change-Id: I48e6cd1b92557727fbd8ee2d803f0121538831d9
Auto-generated-cl: translation import
 2014-12-01 11:09:20 -08:00
Geoff Mendal
533371c592 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-01 19:04:59 +00:00
Jeff Sharkey
05d455ca2b am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev 
* commit 'b9ccc047ca9c1cd4f1c0143f230a4005fa4864a4':
  Sanitize display names, keep extensions intact.
 2014-12-01 19:00:56 +00:00
Jeff Sharkey
916d516349 am e4a5faa6: Merge "APK still has privileged flag after being moved from "/system/priv-app"" into lmp-mr1-dev 
* commit 'e4a5faa61e9084333b241531ddb941684f110566':
  APK still has privileged flag after being moved from "/system/priv-app"
 2014-12-01 19:00:51 +00:00
Geoff Mendal
4618091212 Import translations. DO NOT MERGE 
Change-Id: Ic9c2d5dfcae9b229040c8460ab2a9820d44fa18c
Auto-generated-cl: translation import
 2014-12-01 10:59:03 -08:00
Joe Fernandez
88e04fcbc6 am e9a816c5: am 1f5acf84: docs: December 2014 Dashboard update 
* commit 'e9a816c5934e4c12a865fdab4994ea286c01009d':
  docs: December 2014 Dashboard update
 2014-12-01 18:58:36 +00:00
Jeff Sharkey
b9ccc047ca Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev 2014-12-01 18:57:09 +00:00
Jeff Sharkey
e4a5faa61e Merge "APK still has privileged flag after being moved from "/system/priv-app"" into lmp-mr1-dev 2014-12-01 18:56:57 +00:00
Joe Fernandez
e9a816c593 am 1f5acf84: docs: December 2014 Dashboard update 
* commit '1f5acf84800f58607e5e9f36c48e3b53f10c1163':
  docs: December 2014 Dashboard update
 2014-12-01 18:51:54 +00:00
Joe Fernandez
1f5acf8480 docs: December 2014 Dashboard update 
Change-Id: I80e2477d02ef5eb0964ae6e68ffa11d703db4fe5
 2014-12-01 10:40:54 -08:00
Lorenzo Colitti
829dfa7cd8 Only use mDefaultDns if the network claims to offer Internet 
Currently, if a network does not specify DNS servers, we default
it to using 8.8.8.8. This was done because the emulator did not
specify DNS servers. However, it causes queries to fail slowly,
instead of failing fast, on networks that do not have
connectivity to 8.8.8.8.

Bug: 18327075
Change-Id: I0df13ff4a17ee65e640be96695a3af31b020963a
 2014-12-02 03:40:16 +09:00
Jason Monk
c0c34b428f am 03d705ab: Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev 
* commit '03d705abd60dcd918ae7dcce4c9c48299c1c4995':
  SysUI: QS Wifi get connected wifi rssi from NC
 2014-12-01 18:38:19 +00:00
Amith Yamasani
0c81034cac am 731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev 
* commit '731a5c1a29e5bdbf6e7e4bade9b80f7abe6ec37e':
  Fix parsing bug that affects reading back guest restrictions
 2014-12-01 18:38:14 +00:00
Jason Monk
03d705abd6 Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev 2014-12-01 18:33:39 +00:00
Amith Yamasani
731a5c1a29 Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev 2014-12-01 18:32:11 +00:00
smain@google.com
446bab7956 am 7512a46e: am fdff66ee: change Trulia context image 
* commit '7512a46e7e9dfcd6e522e8229b91a63b9e9189de':
  change Trulia context image
 2014-12-01 18:08:58 +00:00