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

108847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
2c975eda80 am 24a12f67: am 697184b5: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '24a12f67ba534bf158ee85cc998c2afbdfc7948a':
  Import translations. DO NOT MERGE
 2013-07-02 12:36:43 -07:00
Kenny Root
347403680e Merge "KeySetManager: iterate over correct list" 2013-07-02 19:32:45 +00:00
Wink Saville
db011499c8 am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev 
* commit '753d754c7dbd93a56cd671ee865f2e37ec3d3187':
  Fix  NPE if mobile is not supported in checkMobileProvisioning.
 2013-07-02 12:31:15 -07:00
Baligh Uddin
24a12f67ba am 697184b5: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '697184b56f918799440bf7749ea8c1e636a63725':
  Import translations. DO NOT MERGE
 2013-07-02 12:31:12 -07:00
Wink Saville
18a46a26a0 Fix NPE if mobile is not supported in checkMobileProvisioning. 
Bug: 9664438
Change-Id: If0c4938956a80e8d6a21a968aa771d0d8f546b3c
 2013-07-02 11:57:47 -07:00
Kenny Root
92179bc261 KeySetManager: iterate over correct list 
Change-Id: I43e18e824e62b3ec54964ace1485a45616b962f2
 2013-07-02 11:55:45 -07:00
Dianne Hackborn
d9fb14a38a Merge "Misc memory stuff." 2013-07-02 18:30:43 +00:00
Dianne Hackborn
2286cdc0ca Misc memory stuff. 
- New Activity.reportFullyDrawn() method that applicatins can call
  when they know they are fully drawn, allowing us to have better
  app launch time info.  This data is also included in usage stats.
- Added total and free memory data "dumpsys meminfo".
- Tuned the moderate memory levels to be more aggressive about
  considering the device getting low on RAM, and thus starting
  to prune RAM from processes.
- Fixed issues in processstats when reading old data as well as
  resetting and other various fixes.

Change-Id: I20efe7451afb4edfa1aeec448328ba601c24d869
 2013-07-02 11:21:04 -07:00
Wink Saville
753d754c7d Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev 2013-07-02 18:17:00 +00:00
Wink Saville
68e6c6452c Fix NPE if mobile is not supported in checkMobileProvisioning. 
Bug: 9664438
Change-Id: If0c4938956a80e8d6a21a968aa771d0d8f546b3c
 2013-07-02 10:55:14 -07:00
Baligh Uddin
697184b56f Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-07-02 15:59:41 +00:00
Oliver Woodman
3fa263c6bd resolved conflicts for merge of dae9aa3f to master 
Change-Id: I6e1bb2f245042955a5cffcabddc1f33eafdadc8a
 2013-07-02 15:52:03 +01:00
The Android Automerger
cfa556303d merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-02 05:55:24 -07:00
Oliver Woodman
dae9aa3f37 am 9ad7b946: am 0661dd15: Merge "Expose latency methods through AudioManager and AudioTrack." into jb-mr2-dev 
* commit '9ad7b946fe9a5dd706205e90046ddc1bd6cb8ad0':
  Expose latency methods through AudioManager and AudioTrack.
 2013-07-02 01:33:56 -07:00
Oliver Woodman
9ad7b946fe am 0661dd15: Merge "Expose latency methods through AudioManager and AudioTrack." into jb-mr2-dev 
* commit '0661dd157f25e3cf8e89dbfe5d871e77e8e3738f':
  Expose latency methods through AudioManager and AudioTrack.
 2013-07-02 01:31:24 -07:00
Oliver Woodman
0661dd157f Merge "Expose latency methods through AudioManager and AudioTrack." into jb-mr2-dev 2013-07-02 08:11:14 +00:00
Baligh Uddin
7f48bea96b Merge "Import translations. DO NOT MERGE" 2013-07-02 05:37:13 +00:00
Satoshi Kataoka
1ae9e846f3 Merge "Fix possible NPE in IInputMethodWrapper" 2013-07-02 05:35:10 +00:00
Baligh Uddin
d34c92a61b am 14bca947: (-s ours) am cdf5ecc8: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 
* commit '14bca94708363f3a22d741aad9e63132e903397e':
  Import translations. DO NOT MERGE
 2013-07-01 20:57:19 -07:00
Baligh Uddin
14bca94708 am cdf5ecc8: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 
* commit 'cdf5ecc8c5fb754406206a78417c5a3b34c485b3':
  Import translations. DO NOT MERGE
 2013-07-01 20:55:14 -07:00
Baligh Uddin
cdf5ecc8c5 Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 2013-07-02 03:53:08 +00:00
Baligh Uddin
87a345e993 am 22b41b0c: (-s ours) am 178807d5: am d6696b7c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '22b41b0c0909c89031d165f7bed3d2016f930033':
  Import translations. DO NOT MERGE
 2013-07-01 20:35:20 -07:00
Baligh Uddin
22b41b0c09 am 178807d5: am d6696b7c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '178807d590c1c873bd5eaae4c1cf331549fb6bbf':
  Import translations. DO NOT MERGE
 2013-07-01 20:32:18 -07:00
Jeff Sharkey
05373e9daf Merge "Support sorting in storage UI." 2013-07-02 03:30:51 +00:00
Baligh Uddin
178807d590 am d6696b7c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'd6696b7c0b8fdde1cbc9ed5db03126fccef9bb7f':
  Import translations. DO NOT MERGE
 2013-07-01 20:30:14 -07:00
Baligh Uddin
d6696b7c0b Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-07-02 03:28:52 +00:00
Jeff Sharkey
1482789374 Support sorting in storage UI. 
Extract mode information into DisplayState which is now consistent
across directory traversal.  Use grid mode by default when working
with images.  Dialog to switch sort order.

Add testing UI to exercise until we have real clients.

Change-Id: Ic423584d4559732fb3d2aea9e0406b57d43f6e6d
 2013-07-01 20:28:20 -07:00
Jeff Brown
76c07a5cd0 Merge "Move input library code to frameworks/native." 2013-07-02 03:21:22 +00:00
Jeff Brown
9d3b1a424c Move input library code to frameworks/native. 
No longer compile libandroidfw as a static library on the device
since it already exists as a shared library.  Keeping the static
library would force us to provide a static library version of
libinput for the device as well which doesn't make sense.

Change-Id: I3517881b87b47dcc209d80dbd0ac6b5cf29a766f
 2013-07-01 20:11:42 -07:00
Vinit Deshapnde
fa62202efb Temporarily disable 'Scan Always' mode 
This change disables 'Scan Always' by ignoring the setting; and
hard coding value to 'false'. The UI will change based on whatever
is in settings; but underneath we won't enable scans when WiFi is
off.

Change-Id: Ibb1401207b6675e609e979ea23b63177814f762c
 2013-07-01 18:05:22 -07:00
Vinit Deshapnde
e722873afd am 892b52f1: am 9f250e28: am 93647e2f: Merge "Temporarily disable \'Scan Always\' mode" into jb-mr2-dev 
* commit '892b52f1516e0cd7b0c142fc6a390adc7e504895':
  Temporarily disable 'Scan Always' mode
 2013-07-01 18:00:19 -07:00
Vinit Deshapnde
892b52f151 am 9f250e28: am 93647e2f: Merge "Temporarily disable \'Scan Always\' mode" into jb-mr2-dev 
* commit '9f250e28c39abfb14a80c1997a1915b97940e070':
  Temporarily disable 'Scan Always' mode
 2013-07-01 17:58:40 -07:00
Vinit Deshapnde
9f250e28c3 am 93647e2f: Merge "Temporarily disable \'Scan Always\' mode" into jb-mr2-dev 
* commit '93647e2f8f0c1b52d6b8f017096f4f037f9733b9':
  Temporarily disable 'Scan Always' mode
 2013-07-01 17:56:30 -07:00
Vinit Deshapnde
93647e2f8f Merge "Temporarily disable 'Scan Always' mode" into jb-mr2-dev 2013-07-02 00:54:19 +00:00
Vinit Deshapnde
c16b0d0061 Temporarily disable 'Scan Always' mode 
This change disables 'Scan Always' by ignoring the setting; and
hard coding value to 'false'. The UI will change based on whatever
is in settings; but underneath we won't enable scans when WiFi is
off.

Change-Id: Ibb1401207b6675e609e979ea23b63177814f762c
 2013-07-01 17:10:28 -07:00
Jeff Sharkey
bd54e06e21 Merge "Support multi-select in storage UI." 2013-07-02 00:02:31 +00:00
Elliott Hughes
70673628ab am 9544df07: am e88fe7f4: am 94fed1c5: Merge "Track libcore API update." 
* commit '9544df0767b7e3e7d9f807cb2290cd3afba73b7a':
  Track libcore API update.
 2013-07-01 17:01:31 -07:00
Elliott Hughes
bd856a5516 am aaf16120: am 7c56325d: am c26e5505: Merge "Track libcore API update." 
* commit 'aaf1612067451c30d1564f3ac4361527e4ab92c3':
  Track libcore API update.
 2013-07-01 17:01:26 -07:00
Wink Saville
0bc2fe425d am e2be0651: am f313da5b: am aff0ac4d: Merge "Do not set the network mode differently for LTE+CDMA" 
* commit 'e2be065142dc22f1eea033334f6ba4cf16559e56':
  Do not set the network mode differently for LTE+CDMA
 2013-07-01 17:01:23 -07:00
Jeff Sharkey
be8b12e687 Support multi-select in storage UI. 
When caller has specified that multiple documents are okay, enable
multi-select action mode.  Currently only allows document selection,
not directories.  Returns multiple documents through ClipData.

Fix bug where GridView was stuck with 2 columns on tablets.

Change-Id: Id49b29a86330639b56fa116d37e7f0d874980c5b
 2013-07-01 17:00:14 -07:00
Elliott Hughes
9544df0767 am e88fe7f4: am 94fed1c5: Merge "Track libcore API update." 
* commit 'e88fe7f415334ae04a289f8bc697404212784df0':
  Track libcore API update.
 2013-07-01 16:48:00 -07:00
Elliott Hughes
e88fe7f415 am 94fed1c5: Merge "Track libcore API update." 
* commit '94fed1c5d570a92d357657451e5b47aba4feee12':
  Track libcore API update.
 2013-07-01 16:45:33 -07:00
Elliott Hughes
94fed1c5d5 Merge "Track libcore API update." 2013-07-01 23:40:18 +00:00
Elliott Hughes
bf1589d0df Track libcore API update. 
Bug: 3484927
Change-Id: I04de17b1191295e3fa874c9e351ae686d9eecef5
 2013-07-01 16:39:34 -07:00
Elliott Hughes
aaf1612067 am 7c56325d: am c26e5505: Merge "Track libcore API update." 
* commit '7c56325d57c3c6022cfcb9b71343751c572bc656':
  Track libcore API update.
 2013-07-01 16:24:48 -07:00
Elliott Hughes
7c56325d57 am c26e5505: Merge "Track libcore API update." 
* commit 'c26e5505495f7a36163477e12098d5fd2822cae9':
  Track libcore API update.
 2013-07-01 16:22:16 -07:00
Elliott Hughes
c26e550549 Merge "Track libcore API update." 2013-07-01 23:20:09 +00:00
Wink Saville
9f6a7f424f Merge commit '3b5d686e' into fix-merge-conflict 
* commit '3b5d686e':
  Add checkMobileProvisioning to ConnectivityService.

Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458
 2013-07-01 16:12:31 -07:00
Wink Saville
e2be065142 am f313da5b: am aff0ac4d: Merge "Do not set the network mode differently for LTE+CDMA" 
* commit 'f313da5bfe1953fef509ba6bab7f654516a71509':
  Do not set the network mode differently for LTE+CDMA
 2013-07-01 16:03:38 -07:00
Wink Saville
f313da5bfe am aff0ac4d: Merge "Do not set the network mode differently for LTE+CDMA" 
* commit 'aff0ac4d202934dde7765f7418ea2ad38b0c2faa':
  Do not set the network mode differently for LTE+CDMA
 2013-07-01 16:00:23 -07:00